From 3836adbf050d8f63e6a544d9ac5e3b803c97a984 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski Date: Sun, 5 Jun 2011 13:50:22 -0400 Subject: [PATCH] --- yaml --- r: 257289 b: refs/heads/master c: bb5fe2f78eadf5a52d8dcbf9a57728fd107af97b h: refs/heads/master i: 257287: 8ee51b206edce3f00d8f0e32555ebe31fb0ab45f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vmlinux.lds.S | 4 ---- trunk/arch/x86/kernel/vsyscall_64.c | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 9b7724030f13..4df22a6e6175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d319bb79afa4039bda6f85661d6bf0c13299ce93 +refs/heads/master: bb5fe2f78eadf5a52d8dcbf9a57728fd107af97b diff --git a/trunk/arch/x86/kernel/vmlinux.lds.S b/trunk/arch/x86/kernel/vmlinux.lds.S index 98b378dc7f86..4f90082fd640 100644 --- a/trunk/arch/x86/kernel/vmlinux.lds.S +++ b/trunk/arch/x86/kernel/vmlinux.lds.S @@ -182,10 +182,6 @@ SECTIONS *(.vsyscall_2) } - .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { - *(.vsyscall_3) - } - . = ALIGN(__vsyscall_0 + PAGE_SIZE, PAGE_SIZE); #undef VSYSCALL_ADDR diff --git a/trunk/arch/x86/kernel/vsyscall_64.c b/trunk/arch/x86/kernel/vsyscall_64.c index 9b2f3f51bc91..70a5f6eebd6c 100644 --- a/trunk/arch/x86/kernel/vsyscall_64.c +++ b/trunk/arch/x86/kernel/vsyscall_64.c @@ -209,11 +209,6 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) return 0; } -static long __vsyscall(3) venosys_1(void) -{ - return -ENOSYS; -} - /* Assume __initcall executes before all user space. Hopefully kmod doesn't violate that. We'll find out if it does. */ static void __cpuinit vsyscall_set_cpu(int cpu)