diff options
| -rw-r--r-- | arch/powerpc/include/asm/livepatch.h | 5 | ||||
| -rw-r--r-- | arch/s390/include/asm/livepatch.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 5 | ||||
| -rw-r--r-- | kernel/livepatch/core.c | 8 |
4 files changed, 0 insertions, 23 deletions
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h index 5070df19d463..c005aee5ea43 100644 --- a/arch/powerpc/include/asm/livepatch.h +++ b/arch/powerpc/include/asm/livepatch.h | |||
| @@ -24,11 +24,6 @@ | |||
| 24 | #include <linux/sched/task_stack.h> | 24 | #include <linux/sched/task_stack.h> |
| 25 | 25 | ||
| 26 | #ifdef CONFIG_LIVEPATCH | 26 | #ifdef CONFIG_LIVEPATCH |
| 27 | static inline int klp_check_compiler_support(void) | ||
| 28 | { | ||
| 29 | return 0; | ||
| 30 | } | ||
| 31 | |||
| 32 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) | 27 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) |
| 33 | { | 28 | { |
| 34 | regs->nip = ip; | 29 | regs->nip = ip; |
diff --git a/arch/s390/include/asm/livepatch.h b/arch/s390/include/asm/livepatch.h index 672f95b12d40..818612b784cd 100644 --- a/arch/s390/include/asm/livepatch.h +++ b/arch/s390/include/asm/livepatch.h | |||
| @@ -13,11 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
| 15 | 15 | ||
| 16 | static inline int klp_check_compiler_support(void) | ||
| 17 | { | ||
| 18 | return 0; | ||
| 19 | } | ||
| 20 | |||
| 21 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) | 16 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) |
| 22 | { | 17 | { |
| 23 | regs->psw.addr = ip; | 18 | regs->psw.addr = ip; |
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index 2f2bdf0662f8..a66f6706c2de 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h | |||
| @@ -24,11 +24,6 @@ | |||
| 24 | #include <asm/setup.h> | 24 | #include <asm/setup.h> |
| 25 | #include <linux/ftrace.h> | 25 | #include <linux/ftrace.h> |
| 26 | 26 | ||
| 27 | static inline int klp_check_compiler_support(void) | ||
| 28 | { | ||
| 29 | return 0; | ||
| 30 | } | ||
| 31 | |||
| 32 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) | 27 | static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) |
| 33 | { | 28 | { |
| 34 | regs->ip = ip; | 29 | regs->ip = ip; |
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index eb0ee10a1981..112a36ed4a09 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c | |||
| @@ -1220,14 +1220,6 @@ void klp_module_going(struct module *mod) | |||
| 1220 | 1220 | ||
| 1221 | static int __init klp_init(void) | 1221 | static int __init klp_init(void) |
| 1222 | { | 1222 | { |
| 1223 | int ret; | ||
| 1224 | |||
| 1225 | ret = klp_check_compiler_support(); | ||
| 1226 | if (ret) { | ||
| 1227 | pr_info("Your compiler is too old; turning off.\n"); | ||
| 1228 | return -EINVAL; | ||
| 1229 | } | ||
| 1230 | |||
| 1231 | klp_root_kobj = kobject_create_and_add("livepatch", kernel_kobj); | 1223 | klp_root_kobj = kobject_create_and_add("livepatch", kernel_kobj); |
| 1232 | if (!klp_root_kobj) | 1224 | if (!klp_root_kobj) |
| 1233 | return -ENOMEM; | 1225 | return -ENOMEM; |
