3 files changed, 40 insertions, 20 deletions

diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index 6efe04f3cbca..071100ea1251 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -344,20 +344,30 @@ 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, }
-}; 
+        {
+                .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 }, 
-        { 0 }, 
-}; 
+static ctl_table abi_root_table2[] = {
+        {
+                .ctl_name = CTL_ABI,
+                .procname = "abi",
+                .mode = 0555,
+                .child = abi_table2
+        },
+        {}
+};
 
 static __init int ia32_binfmt_init(void)
 { 
-        register_sysctl_table(abi_root_table2, 1);
+        register_sysctl_table(abi_root_table2);
         return 0;
 }
 __initcall(ia32_binfmt_init);
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 2433d6fc68b1..313dc6ad780b 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -235,13 +235,13 @@ static ctl_table kernel_table2[] = {
           .data = &sysctl_vsyscall, .maxlen = sizeof(int), .mode = 0644,
           .strategy = vsyscall_sysctl_nostrat,
           .proc_handler = vsyscall_sysctl_change },
-        { 0, }
+        {}
 };
 
 static ctl_table kernel_root_table2[] = {
         { .ctl_name = CTL_KERN, .procname = "kernel", .mode = 0555,
           .child = kernel_table2 },
-        { 0 },
+        {}
 };
 
 #endif
@@ -301,7 +301,7 @@ static int __init vsyscall_init(void)
         BUG_ON((unsigned long) &vgetcpu != VSYSCALL_ADDR(__NR_vgetcpu));
         map_vsyscall();
 #ifdef CONFIG_SYSCTL
-        register_sysctl_table(kernel_root_table2, 0);
+        register_sysctl_table(kernel_root_table2);
 #endif
         on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
         hotcpu_notifier(cpu_vsyscall_notifier, 0);
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 2968b90ef8ad..ec31534eb104 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -711,20 +711,30 @@ int kern_addr_valid(unsigned long addr)
 extern int exception_trace, page_fault_trace;
 
 static ctl_table debug_table2[] = {
-        { 99, "exception-trace", &exception_trace, sizeof(int), 0644, NULL,
-          proc_dointvec },
-        { 0, }
+        {
+                .ctl_name       = 99,
+                .procname       = "exception-trace",
+                .data           = &exception_trace,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec
+        },
+        {}
 }; 
 
 static ctl_table debug_root_table2[] = { 
-        { .ctl_name = CTL_DEBUG, .procname = "debug", .mode = 0555, 
-           .child = debug_table2 }, 
-        { 0 }, 
+        {
+                .ctl_name = CTL_DEBUG,
+                .procname = "debug",
+                .mode = 0555,
+                .child = debug_table2
+        },
+        {}
 }; 
 
 static __init int x8664_sysctl_init(void)
 { 
-        register_sysctl_table(debug_root_table2, 1);
+        register_sysctl_table(debug_root_table2);
         return 0;
 }
 __initcall(x8664_sysctl_init);