aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/include/asm/livepatch.h2
-rw-r--r--arch/x86/include/asm/livepatch.h2
-rw-r--r--include/linux/livepatch.h4
3 files changed, 0 insertions, 8 deletions
diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h
index 105074582d86..d5427c78b1b3 100644
--- a/arch/s390/include/asm/livepatch.h
+++ b/arch/s390/include/asm/livepatch.h
@@ -19,7 +19,6 @@
19 19
20#include <linux/module.h> 20#include <linux/module.h>
21 21
22#ifdef CONFIG_LIVEPATCH
23static inline int klp_check_compiler_support(void) 22static inline int klp_check_compiler_support(void)
24{ 23{
25 return 0; 24 return 0;
@@ -36,6 +35,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
36{ 35{
37 regs->psw.addr = ip; 36 regs->psw.addr = ip;
38} 37}
39#endif
40 38
41#endif 39#endif
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index 8acfe798625b..7e68f9558552 100644
--- a/arch/x86/include/asm/livepatch.h
+++ b/arch/x86/include/asm/livepatch.h
@@ -25,7 +25,6 @@
25#include <linux/module.h> 25#include <linux/module.h>
26#include <linux/ftrace.h> 26#include <linux/ftrace.h>
27 27
28#ifdef CONFIG_LIVEPATCH
29static inline int klp_check_compiler_support(void) 28static inline int klp_check_compiler_support(void)
30{ 29{
31#ifndef CC_USING_FENTRY 30#ifndef CC_USING_FENTRY
@@ -40,6 +39,5 @@ static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip)
40{ 39{
41 regs->ip = ip; 40 regs->ip = ip;
42} 41}
43#endif
44 42
45#endif /* _ASM_X86_LIVEPATCH_H */ 43#endif /* _ASM_X86_LIVEPATCH_H */
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index a8828652f794..c05679701e10 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -24,8 +24,6 @@
24#include <linux/module.h> 24#include <linux/module.h>
25#include <linux/ftrace.h> 25#include <linux/ftrace.h>
26 26
27#if IS_ENABLED(CONFIG_LIVEPATCH)
28
29#include <asm/livepatch.h> 27#include <asm/livepatch.h>
30 28
31enum klp_state { 29enum klp_state {
@@ -134,6 +132,4 @@ int klp_unregister_patch(struct klp_patch *);
134int klp_enable_patch(struct klp_patch *); 132int klp_enable_patch(struct klp_patch *);
135int klp_disable_patch(struct klp_patch *); 133int klp_disable_patch(struct klp_patch *);
136 134
137#endif /* CONFIG_LIVEPATCH */
138
139#endif /* _LINUX_LIVEPATCH_H_ */ 135#endif /* _LINUX_LIVEPATCH_H_ */