summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-01-09 10:53:21 +0100
committerJiri Kosina <jkosina@suse.cz>2015-01-09 10:55:10 +0100
commitb9dfe0bed999d23ee8838d389637dd8aef83fafa (patch)
tree1e1761aa65759226ca26fe931b1b48de4cf65af9 /arch/x86
parentlivepatch: kconfig: use bool instead of boolean (diff)
downloadlinux-b9dfe0bed999d23ee8838d389637dd8aef83fafa.tar.xz
linux-b9dfe0bed999d23ee8838d389637dd8aef83fafa.zip
livepatch: handle ancient compilers with more grace
We are aborting a build in case when gcc doesn't support fentry on x86_64 (regs->ip modification can't really reliably work with mcount). This however breaks allmodconfig for people with older gccs that don't support -mfentry. Turn the build-time failure into runtime failure, resulting in the whole infrastructure not being initialized if CC_USING_FENTRY is unset. Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/livepatch.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h
index b5608d7757fd..26e58134c8cb 100644
--- a/arch/x86/include/asm/livepatch.h
+++ b/arch/x86/include/asm/livepatch.h
@@ -25,9 +25,13 @@
#include <linux/ftrace.h>
#ifdef CONFIG_LIVE_PATCHING
+static inline int klp_check_compiler_support(void)
+{
#ifndef CC_USING_FENTRY
-#error Your compiler must support -mfentry for live patching to work
+ return 1;
#endif
+ return 0;
+}
extern int klp_write_module_reloc(struct module *mod, unsigned long type,
unsigned long loc, unsigned long value);