projects/linux·commit f82da161

powerpc: restore removed #endif

f82da161 · Stephen Rothwell <[email protected]> · 2022-03-28 08:55:39 +11:00

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 <[email protected]>
Brown-paper-bag-by: Linus Torvalds <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
f82da161ea75dc4db21b2499e4b1facd36dab275
Parents
29cbaa3e

Changes

1 files changed · +1 −0

FileStatusAddDelContent
arch/powerpc/include/asm/livepatch.hmodified+1−0View file

arch/powerpc/include/asm/livepatch.h

View file
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h
index fd65931..1c60094 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)