[PATCH RT 05/25][RFC 3.0.23-rt39-rc1] x86-64-remove-vsyscall-number-3

Steven Rostedt
2012-03-06T16:19:49Z

[-- Attachment #1: 0005-x86-64-remove-vsyscall-number-3.patch --]
[-- Type: text/plain, Size: 1490 bytes --]

From: Andy Lutomirski <luto@mit.edu>

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>
---
arch/x86/kernel/vmlinux.lds.S | 4 ----
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 89aed99..85d4a06 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 3e68218..a2d96c7 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;
-}