diff options
author | Andy Lutomirski <luto@mit.edu> | 2012-03-06 10:34:37 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-05-14 12:37:16 -0400 |
commit | 3b18fe82070792114f0eb385cbbf0f52beae03a9 (patch) | |
tree | abe2132214748f832d7c2f145c7b5e83cbcce241 | |
parent | 4cee8ae7e686b2805ed9a12a7544e90ecb5a483d (diff) |
x86-64-remove-vsyscall-number-3
commit bb5fe2f78eadf5a52d8dcbf9a57728fd107af97b
Author: Andy Lutomirski <luto@mit.edu>
Date: Sun Jun 5 13:50:22 2011 -0400
x86-64: Remove vsyscall number 3 (venosys)
It just segfaults since April 2008 (a4928cff), so I'm pretty
sure that nothing uses it. And having an empty section makes
the linker script a bit fragile.
Signed-off-by: Andy Lutomirski <luto@mit.edu>
Link: http://lkml.kernel.org/r/4a4abcf47ecadc269f2391a313576fe6d06acef7.1307292171.git.luto@mit.edu
backport by:
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 4 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 89aed99aafce..85d4a0677483 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -188,10 +188,6 @@ SECTIONS *(.vsyscall_2) } - .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { - *(.vsyscall_3) - } - #define __VVAR_KERNEL_LDS #include <asm/vvar.h> #undef __VVAR_KERNEL_LDS diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 3e682184d76c..a2d96c749e13 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -222,11 +222,6 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) return 0; } -static long __vsyscall(3) venosys_1(void) -{ - return -ENOSYS; -} - #ifdef CONFIG_SYSCTL static ctl_table kernel_table2[] = { { .procname = "vsyscall64", |