linux-next: build failure in Linus' tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 arch/powerpc/include/asm/livepatch.h | 1 +
 1 file changed, 1 insertion(+)

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)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpBW8QlZd9P3.pgp
Description: OpenPGP digital signature