summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/vsyscall.h
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-10-29 22:33:47 +0100
committerThomas Gleixner <tglx@linutronix.de>2014-11-03 21:44:57 +0100
commit1ad83c858c7d4ea210429142c99a1548e6715a35 (patch)
tree9c40dd5e49b646ae68e252c9a3e8afbd01a6a588 /arch/x86/include/asm/vsyscall.h
parentx86_64, vsyscall: Rewrite comment and clean up headers in vsyscall code (diff)
downloadlinux-1ad83c858c7d4ea210429142c99a1548e6715a35.tar.xz
linux-1ad83c858c7d4ea210429142c99a1548e6715a35.zip
x86_64,vsyscall: Make vsyscall emulation configurable
This adds CONFIG_X86_VSYSCALL_EMULATION, guarded by CONFIG_EXPERT. Turning it off completely disables vsyscall emulation, saving ~3.5k for vsyscall_64.c, 4k for vsyscall_emu_64.S (the fake vsyscall page), some tiny amount of core mm code that supports a gate area, and possibly 4k for a wasted pagetable. The latter is because the vsyscall addresses are misaligned and fit poorly in the fixmap. Signed-off-by: Andy Lutomirski <luto@amacapital.net> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Link: http://lkml.kernel.org/r/406db88b8dd5f0cbbf38216d11be34bbb43c7eae.1414618407.git.luto@amacapital.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/vsyscall.h')
-rw-r--r--arch/x86/include/asm/vsyscall.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index 34f7d8857542..6ba66ee79710 100644
--- a/arch/x86/include/asm/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
@@ -4,6 +4,7 @@
#include <linux/seqlock.h>
#include <uapi/asm/vsyscall.h>
+#ifdef CONFIG_X86_VSYSCALL_EMULATION
extern void map_vsyscall(void);
/*
@@ -11,5 +12,12 @@ extern void map_vsyscall(void);
* Returns true if handled.
*/
extern bool emulate_vsyscall(struct pt_regs *regs, unsigned long address);
+#else
+static inline void map_vsyscall(void) {}
+static inline bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
+{
+ return false;
+}
+#endif
#endif /* _ASM_X86_VSYSCALL_H */