aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@mit.edu>2011-06-05 13:50:22 -0400
committerIngo Molnar <mingo@elte.hu>2011-06-06 03:43:14 -0400
commitbb5fe2f78eadf5a52d8dcbf9a57728fd107af97b (patch)
treeed6d87558e2b9610efa45330a0083b7cc3993d1a /arch
parentd319bb79afa4039bda6f85661d6bf0c13299ce93 (diff)
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> Cc: Jesper Juhl <jj@chaosbits.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Jan Beulich <JBeulich@novell.com> Cc: richard -rw- weinberger <richard.weinberger@gmail.com> Cc: Mikael Pettersson <mikpe@it.uu.se> Cc: Andi Kleen <andi@firstfloor.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Louis Rilling <Louis.Rilling@kerlabs.com> Cc: Valdis.Kletnieks@vt.edu Cc: pageexec@freemail.hu Link: http://lkml.kernel.org/r/4a4abcf47ecadc269f2391a313576fe6d06acef7.1307292171.git.luto@mit.edu Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/vmlinux.lds.S4
-rw-r--r--arch/x86/kernel/vsyscall_64.c5
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 98b378dc7f86..4f90082fd640 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -182,10 +182,6 @@ SECTIONS
182 *(.vsyscall_2) 182 *(.vsyscall_2)
183 } 183 }
184 184
185 .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
186 *(.vsyscall_3)
187 }
188
189 . = ALIGN(__vsyscall_0 + PAGE_SIZE, PAGE_SIZE); 185 . = ALIGN(__vsyscall_0 + PAGE_SIZE, PAGE_SIZE);
190 186
191#undef VSYSCALL_ADDR 187#undef VSYSCALL_ADDR
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 9b2f3f51bc91..70a5f6eebd6c 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -209,11 +209,6 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
209 return 0; 209 return 0;
210} 210}
211 211
212static long __vsyscall(3) venosys_1(void)
213{
214 return -ENOSYS;
215}
216
217/* Assume __initcall executes before all user space. Hopefully kmod 212/* Assume __initcall executes before all user space. Hopefully kmod
218 doesn't violate that. We'll find out if it does. */ 213 doesn't violate that. We'll find out if it does. */
219static void __cpuinit vsyscall_set_cpu(int cpu) 214static void __cpuinit vsyscall_set_cpu(int cpu)