powerpc: restore removed #endif
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 27 Mar 2022 21:55:39 +0000 (08:55 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Mar 2022 22:31:16 +0000 (15:31 -0700)
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>
Brown-paper-bag-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/powerpc/include/asm/livepatch.h

index fd65931..1c60094 100644 (file)
@@ -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)