[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>

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 44c83be70e08..354a0a01ec2d 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)
 {