1 files changed, 38 insertions, 48 deletions

diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 24adb7566e8b..e04f7b5f2aab 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -101,67 +101,57 @@ static int xpc_disengage_request_max_timelimit = 120;
 
 static ctl_table xpc_sys_xpc_hb_dir[] = {
         {
-                CTL_UNNUMBERED,
-                "hb_interval",
-                &xpc_hb_interval,
-                sizeof(int),
-                0644,
-                NULL,
-                &proc_dointvec_minmax,
-                &sysctl_intvec,
-                NULL,
-                &xpc_hb_min_interval,
-                &xpc_hb_max_interval
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "hb_interval",
+                .data           = &xpc_hb_interval,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &xpc_hb_min_interval,
+                .extra2         = &xpc_hb_max_interval
         },
         {
-                CTL_UNNUMBERED,
-                "hb_check_interval",
-                &xpc_hb_check_interval,
-                sizeof(int),
-                0644,
-                NULL,
-                &proc_dointvec_minmax,
-                &sysctl_intvec,
-                NULL,
-                &xpc_hb_check_min_interval,
-                &xpc_hb_check_max_interval
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "hb_check_interval",
+                .data           = &xpc_hb_check_interval,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &xpc_hb_check_min_interval,
+                .extra2         = &xpc_hb_check_max_interval
         },
-        {0}
+        {}
 };
 static ctl_table xpc_sys_xpc_dir[] = {
         {
-                CTL_UNNUMBERED,
-                "hb",
-                NULL,
-                0,
-                0555,
-                xpc_sys_xpc_hb_dir
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "hb",
+                .mode           = 0555,
+                .child          = xpc_sys_xpc_hb_dir
         },
         {
-                CTL_UNNUMBERED,
-                "disengage_request_timelimit",
-                &xpc_disengage_request_timelimit,
-                sizeof(int),
-                0644,
-                NULL,
-                &proc_dointvec_minmax,
-                &sysctl_intvec,
-                NULL,
-                &xpc_disengage_request_min_timelimit,
-                &xpc_disengage_request_max_timelimit
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "disengage_request_timelimit",
+                .data           = &xpc_disengage_request_timelimit,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec_minmax,
+                .strategy       = &sysctl_intvec,
+                .extra1         = &xpc_disengage_request_min_timelimit,
+                .extra2         = &xpc_disengage_request_max_timelimit
         },
-        {0}
+        {}
 };
 static ctl_table xpc_sys_dir[] = {
         {
-                CTL_UNNUMBERED,
-                "xpc",
-                NULL,
-                0,
-                0555,
-                xpc_sys_xpc_dir
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "xpc",
+                .mode           = 0555,
+                .child          = xpc_sys_xpc_dir
         },
-        {0}
+        {}
 };
 static struct ctl_table_header *xpc_sysctl;