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 1050745..d5427c7 100644
--- 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 @@
{
regs->psw.addr = ip;
}
-#endif
#endif
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index 8acfe79..7e68f95 100644
--- 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 @@
{
regs->ip = ip;
}
-#endif
#endif /* _ASM_X86_LIVEPATCH_H */
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index a882865..c056797 100644
--- 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_enable_patch(struct klp_patch *);
int klp_disable_patch(struct klp_patch *);
-#endif /* CONFIG_LIVEPATCH */
-
#endif /* _LINUX_LIVEPATCH_H_ */