powerpc: restore removed #endif

sfrothwell · torvalds · commit f82da161ea75 · 2022-03-27T15:31:16.000-07:00
Fixes: 7001052 ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)`
`16`	`16`	`{`
`17`	`17`	`ftrace_instruction_pointer_set(fregs, ip);`
`18`	`18`	`}`
	`19`	`+#endif /* CONFIG_LIVEPATCH */`
`19`	`20`
`20`	`21`	`#ifdef CONFIG_LIVEPATCH_64`
`21`	`22`	`static inline void klp_init_thread_info(struct task_struct *p)`