diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-03-06 22:20:25 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-03-06 22:22:10 +0100 |
| commit | 335e073faacc9d90bee1527fa2550d6df045df63 (patch) | |
| tree | c44b7f6a74eb0b51c79e8d30a196051d443cd728 | |
| parent | b24b78a113164a84bf242b08ef2165365445ea2b (diff) | |
| download | linux-335e073faacc9d90bee1527fa2550d6df045df63.tar.gz | |
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>
| -rw-r--r-- | arch/s390/include/asm/livepatch.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 2 | ||||
| -rw-r--r-- | include/linux/livepatch.h | 4 |
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 @@ #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 8acfe798625b..7e68f9558552 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 @@ 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 a8828652f794..c05679701e10 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_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_ */ |