summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/ia32
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 00:33:49 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 08:09:57 -0800
commit306421f387ccea0e8eeb04425e674910f100952b (patch)
tree4fb010d6e91fcdd80a0fec729a0feabe4121b0fb /arch/x86_64/ia32
parentf3854517f3b4cf372d3d5a2a71969c9b26090b7a (diff)
downloadkernel-crypto-306421f387ccea0e8eeb04425e674910f100952b.tar.gz
kernel-crypto-306421f387ccea0e8eeb04425e674910f100952b.tar.xz
kernel-crypto-306421f387ccea0e8eeb04425e674910f100952b.zip
[PATCH] sysctl: C99 convert ctl_tables in arch/x86_64/ia32/ia32_binfmt.c
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: 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/x86_64/ia32')
-rw-r--r--arch/x86_64/ia32/ia32_binfmt.c30
1 files changed, 20 insertions, 10 deletions
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index 44c83be70e0..354a0a01ec2 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -344,16 +344,26 @@ EXPORT_SYMBOL(ia32_setup_arg_pages);
#include <linux/sysctl.h>
static ctl_table abi_table2[] = {
- { 99, "vsyscall32", &sysctl_vsyscall32, sizeof(int), 0644, NULL,
- proc_dointvec },
- { 0, }
-};
-
-static ctl_table abi_root_table2[] = {
- { .ctl_name = CTL_ABI, .procname = "abi", .mode = 0555,
- .child = abi_table2 },
- { 0 },
-};
+ {
+ .ctl_name = 99,
+ .procname = "vsyscall32",
+ .data = &sysctl_vsyscall32,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec
+ },
+ {}
+};
+
+static ctl_table abi_root_table2[] = {
+ {
+ .ctl_name = CTL_ABI,
+ .procname = "abi",
+ .mode = 0555,
+ .child = abi_table2
+ },
+ {}
+};
static __init int ia32_binfmt_init(void)
{