| Message ID | 20220328090111.26f8980f@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: build failure in Linus' tree | expand |
On Sun, Mar 27, 2022 at 3:01 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Building LInus' tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: Gaah. I even *looked* at that code when merging, and convinced myself I had gotten the #ifdef/#endif chain right. Apparently I can't count. What a maroon I am. Will apply that patch asap. Thanks, Linus
-#endif /* CONFIG_LIVEPATCH */ On Sun, Mar 27, 2022 at 3:23 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > I even *looked* at that code when merging, and convinced myself I had > gotten the #ifdef/#endif chain right. Apparently I can't count. > > What a maroon I am. Oh, and I see why I screwed up: I even did a "git diff" against the original powerpc tree, but then I visually matched -#define klp_get_ftrace_location klp_get_ftrace_location ... -#endif /* CONFIG_LIVEPATCH */ as a #ifdef/#endif pair. Now that I look at it knowing that I screwed up, I go "Duh!". Time to take my meds, Linus
Hi Linus, On Sun, 27 Mar 2022 15:23:24 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote: > > Will apply that patch asap. Thanks
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h index fd65931a739f..1c60094ea0cd 100644 --- a/arch/powerpc/include/asm/livepatch.h +++ b/arch/powerpc/include/asm/livepatch.h @@ -16,6 +16,7 @@ static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip) { ftrace_instruction_pointer_set(fregs, ip); } +#endif /* CONFIG_LIVEPATCH */ #ifdef CONFIG_LIVEPATCH_64 static inline void klp_init_thread_info(struct task_struct *p)
Hi all, Building LInus' tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: In file included from arch/powerpc/kernel/irq.c:66: arch/powerpc/include/asm/livepatch.h:7: error: unterminated #ifndef 7 | #ifndef _ASM_POWERPC_LIVEPATCH_H | Caused by commit 7001052160d1 ("Merge tag 'x86_core_for_5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") A #endif got removed during the merge resolution :-( I have applied the following patch for today From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 28 Mar 2022 08:55:39 +1100 Subject: [PATCH] powerpc: restore removed #endif Fixes: 7001052160d1 ("Merge tag 'x86_core_for_5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/livepatch.h | 1 + 1 file changed, 1 insertion(+)