From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>
Cc: Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Naveen N Rao <naveen@kernel•org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: Re: linux-next: build failure after merge of the ftrace tree
Date: Thu, 21 Nov 2024 10:27:21 +1100 [thread overview]
Message-ID: <20241121102721.63ed1c05@canb.auug.org.au> (raw)
In-Reply-To: <20241106140414.760b502c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2251 bytes --]
Hi all,
On Wed, 6 Nov 2024 14:04:14 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the ftrace tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> In file included from include/linux/ftrace.h:23,
> from include/linux/kvm_host.h:32,
> from arch/powerpc/include/asm/kvm_ppc.h:19,
> from arch/powerpc/include/asm/dbell.h:17,
> from arch/powerpc/kernel/asm-offsets.c:36:
> arch/powerpc/include/asm/ftrace.h: In function 'arch_ftrace_set_direct_caller':
> arch/powerpc/include/asm/ftrace.h:141:38: error: invalid use of undefined type 'struct ftrace_regs'
> 141 | struct pt_regs *regs = &fregs->regs;
> | ^~
>
> Caused by commit
>
> 7888af4166d4 ("ftrace: Make ftrace_regs abstract from direct use")
>
> interacting with commit
>
> a52f6043a223 ("powerpc/ftrace: Add support for DYNAMIC_FTRACE_WITH_DIRECT_CALLS")
>
> from the powerpc tree.
>
> I have applied the following merge fix patch for today.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Wed, 6 Nov 2024 13:33:53 +1100
> Subject: [PATCH] fix up for "ftrace: Make ftrace_regs abstract from direct use"
>
> from the ftrace tree interacting with "powerpc/ftrace: Add support for
> DYNAMIC_FTRACE_WITH_DIRECT_CALLS" from the powerpc tree
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> arch/powerpc/include/asm/ftrace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
> index bb2c90997618..db481b336bca 100644
> --- a/arch/powerpc/include/asm/ftrace.h
> +++ b/arch/powerpc/include/asm/ftrace.h
> @@ -138,7 +138,7 @@ unsigned long ftrace_call_adjust(unsigned long addr);
> */
> static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, unsigned long addr)
> {
> - struct pt_regs *regs = &fregs->regs;
> + struct pt_regs *regs = &arch_ftrace_regs(fregs)->regs;
>
> regs->orig_gpr3 = addr;
> }
This patch is now needed when the powerpc tree is merged with Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-11-20 23:27 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-06 3:04 linux-next: build failure after merge of the ftrace tree Stephen Rothwell
2024-11-06 15:02 ` Steven Rostedt
2024-11-06 17:47 ` Linus Torvalds
2024-11-20 23:27 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-06 1:33 Stephen Rothwell
2025-11-06 2:01 ` Steven Rostedt
2025-10-02 15:50 Mark Brown
2025-10-06 0:31 ` Masami Hiramatsu
2025-03-11 5:27 Stephen Rothwell
2025-03-11 13:22 ` Steven Rostedt
2024-11-08 4:21 Stephen Rothwell
2024-11-08 14:59 ` Steven Rostedt
2024-11-08 15:09 ` Alice Ryhl
2024-11-08 20:35 ` Steven Rostedt
2024-11-08 21:05 ` Miguel Ojeda
2024-11-08 21:53 ` Miguel Ojeda
2024-11-09 11:09 ` Steven Rostedt
2024-11-09 11:55 ` Miguel Ojeda
2024-11-09 13:03 ` Steven Rostedt
2024-11-09 16:57 ` Miguel Ojeda
2024-10-10 2:46 Stephen Rothwell
2024-10-10 3:13 ` Donglin Peng
2024-10-10 13:27 ` Steven Rostedt
2024-10-10 14:08 ` Donglin Peng
2024-10-10 15:04 ` Steven Rostedt
2024-10-10 15:58 ` Steven Rostedt
2023-10-23 2:30 Stephen Rothwell
2023-10-23 3:32 ` Matthew Wilcox
2023-10-23 13:41 ` Steven Rostedt
2023-10-26 1:18 ` Stephen Rothwell
2023-10-26 1:21 ` Steven Rostedt
2022-01-12 0:31 Stephen Rothwell
2022-01-14 1:02 ` Stephen Rothwell
2022-01-14 1:04 ` Steven Rostedt
2022-01-14 2:16 ` Steven Rostedt
2022-01-14 2:58 ` Stephen Rothwell
2022-01-14 3:02 ` Stephen Rothwell
2022-01-14 3:25 ` Steven Rostedt
2022-01-14 3:34 ` Stephen Rothwell
2022-01-14 3:50 ` Steven Rostedt
2022-01-14 5:12 ` Yinan Liu
2022-01-14 6:42 ` Stephen Rothwell
2021-06-10 8:08 Stephen Rothwell
2021-06-10 8:26 ` Peter Zijlstra
2021-06-10 15:06 ` Steven Rostedt
2021-06-15 6:51 ` Mark-PK Tsai
2020-06-03 7:42 Stephen Rothwell
2020-06-03 15:10 ` Tom Zanussi
2020-06-03 15:22 ` Steven Rostedt
2020-06-03 15:24 ` Tom Zanussi
2020-06-03 15:30 ` Steven Rostedt
2020-06-03 21:49 ` Stephen Rothwell
2014-11-21 7:32 Stephen Rothwell
2014-11-21 10:50 ` Jiri Kosina
2014-11-21 14:20 ` Steven Rostedt
2014-11-21 14:23 ` Jiri Kosina
2014-11-21 14:27 ` Steven Rostedt
2014-11-21 12:43 ` Steven Rostedt
2013-03-01 2:47 Stephen Rothwell
2013-03-01 3:06 ` Steven Rostedt
2013-03-02 2:45 ` Steven Rostedt
2013-03-02 3:42 ` Stephen Rothwell
2013-03-02 3:55 ` Steven Rostedt
2013-03-02 4:17 ` Stephen Rothwell
2013-03-02 4:22 ` Steven Rostedt
2013-03-02 4:55 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241121102721.63ed1c05@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=naveen@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox