Merge branch 'master' into upstream

1 files changed, 9 insertions, 4 deletions

diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index bd129d3c2cc1..0a7e42d54eaf 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -442,17 +442,22 @@ static ctl_table htab_ctl_table[]={
                 .mode           = 0644,
                 .proc_handler   = &proc_dol2crvec,
         },
-        { 0, },
+        {}
 };
 static ctl_table htab_sysctl_root[] = {
-        { 1, "kernel", NULL, 0, 0755, htab_ctl_table, },
-        { 0,},
+        {
+                .ctl_name       = CTL_KERN,
+                .procname       = "kernel",
+                .mode           = 0555,
+                .child          = htab_ctl_table,
+        },
+        {}
 };
 
 static int __init
 register_ppc_htab_sysctl(void)
 {
-        register_sysctl_table(htab_sysctl_root, 0);
+        register_sysctl_table(htab_sysctl_root);
 
         return 0;
 }