klp: remove CONFIG_LIVEPATCH dependency from klp headers

There is no need for livepatch.h (generic and arch-specific) to depend
on CONFIG_LIVEPATCH. Remove that superfluous dependency.

Reported-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h
index 105074582d864203fafbbf159348da8a1b7f940b..d5427c78b1b3edb1bbccff92bfbf4c86c45d6214 100644 (file)
--- a/arch/s390/include/asm/livepatch.h
+++ b/arch/s390/include/asm/livepatch.h
@@ -19,7 +19,6 @@
 
 #include <linux/module.h>
 
-#ifdef CONFIG_LIVEPATCH
 static inline int klp_check_compiler_support(void)
 {
        return 0;
@@ -36,6 +35,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 {
        regs->psw.addr = ip;
 }
-#endif
 
 #endif

diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index 8acfe798625be7316d82c46488b585493170c128..7e68f95585523bdc315883b023bdae4a0deeb017 100644 (file)
--- a/arch/x86/include/asm/livepatch.h
+++ b/arch/x86/include/asm/livepatch.h
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/ftrace.h>
 
-#ifdef CONFIG_LIVEPATCH
 static inline int klp_check_compiler_support(void)
 {
 #ifndef CC_USING_FENTRY
@@ -40,6 +39,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 {
        regs->ip = ip;
 }
-#endif
 
 #endif /* _ASM_X86_LIVEPATCH_H */

diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index a8828652f79428dfb888121489e457fe5c13bd5b..c05679701e105b2ca98770f639f1547ed82b15ba 100644 (file)
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -24,8 +24,6 @@
 #include <linux/module.h>
 #include <linux/ftrace.h>
 
-#if IS_ENABLED(CONFIG_LIVEPATCH)
-
 #include <asm/livepatch.h>
 
 enum klp_state {
@@ -134,6 +132,4 @@ int klp_unregister_patch(struct klp_patch *);
 int klp_enable_patch(struct klp_patch *);
 int klp_disable_patch(struct klp_patch *);
 
-#endif /* CONFIG_LIVEPATCH */
-
 #endif /* _LINUX_LIVEPATCH_H_ */