aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-18 06:05:27 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:22 -0400
commit282a821f18fe848db860e911fa5e1f6a3603dd80 (patch)
treea9a7918627bbbcca776d8cb52d0881a6fc49fba6 /arch
parentbaa3a2a0d24ebcf1c451bec8e5bee3d3467f4cbb (diff)
sysctl: x86_64 remove unnecessary binary paths
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Alexey Dobriyan <adobriyan@sw.ru> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/ia32/ia32_binfmt.c1
-rw-r--r--arch/x86/kernel/vsyscall_64.c10
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index 118b9f9ff499..5027650eb273 100644
--- a/arch/x86/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
@@ -289,7 +289,6 @@ static void elf32_init(struct pt_regs *regs)
289 289
290static ctl_table abi_table2[] = { 290static ctl_table abi_table2[] = {
291 { 291 {
292 .ctl_name = 99,
293 .procname = "vsyscall32", 292 .procname = "vsyscall32",
294 .data = &sysctl_vsyscall32, 293 .data = &sysctl_vsyscall32,
295 .maxlen = sizeof(int), 294 .maxlen = sizeof(int),
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index f24e8acdec91..cf7a47b35e10 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -266,18 +266,10 @@ out:
266 return ret; 266 return ret;
267} 267}
268 268
269static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,
270 void __user *oldval, size_t __user *oldlenp,
271 void __user *newval, size_t newlen)
272{
273 return -ENOSYS;
274}
275
276static ctl_table kernel_table2[] = { 269static ctl_table kernel_table2[] = {
277 { .ctl_name = 99, .procname = "vsyscall64", 270 { .procname = "vsyscall64",
278 .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), 271 .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
279 .mode = 0644, 272 .mode = 0644,
280 .strategy = vsyscall_sysctl_nostrat,
281 .proc_handler = vsyscall_sysctl_change }, 273 .proc_handler = vsyscall_sysctl_change },
282 {} 274 {}
283}; 275};