[v2 007/115] sysctl: remove .child from abi/vsyscall32 (x86)
From: Lucian Adrian Grijincu <hidden>
Date: 2011-05-08 23:06:13
Also in:
lkml
Subsystem:
the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Signed-off-by: Lucian Adrian Grijincu <redacted> --- arch/x86/vdso/vdso32-setup.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 468d591..e6ef3b4 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c@@ -380,7 +380,7 @@ subsys_initcall(sysenter_setup); /* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h> -static ctl_table abi_table2[] = { +static ctl_table abi_table[] = { { .procname = "vsyscall32", .data = &sysctl_vsyscall32,
@@ -391,18 +391,14 @@ static ctl_table abi_table2[] = { {} }; -static ctl_table abi_root_table2[] = { - { - .procname = "abi", - .mode = 0555, - .child = abi_table2 - }, - {} +static const struct ctl_path abi_root_path[] = { + { .procname = "abi" }, + { } }; static __init int ia32_binfmt_init(void) { - register_sysctl_table(abi_root_table2); + register_sysctl_paths(abi_root_path, abi_table); return 0; } __initcall(ia32_binfmt_init);
--
1.7.5.134.g1c08b