aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2022-03-28 08:55:39 +1100
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-27 15:31:16 -0700
commitf82da161ea75dc4db21b2499e4b1facd36dab275 (patch)
treece6f5a8c2d26f006b11849fbfa5e35bc0c00480c
parent29cbaa3e60dfe48e341a3a5ce1c2d8f3d9e9667c (diff)
downloadci-f82da161ea75dc4db21b2499e4b1facd36dab275.tar.gz
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> Brown-paper-bag-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/powerpc/include/asm/livepatch.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h
index fd65931a739f71..1c60094ea0cd23 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)