sparc64: cheaper asm/uaccess.h inclusion

[safe/jmp/linux-2.6] / net / x25 / sysctl_net_x25.c

diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 68300d4..a5d3416 100644 (file)
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -24,8 +24,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_restart_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -35,8 +35,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_call_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -46,8 +46,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_reset_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -57,8 +57,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_clear_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -68,8 +68,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_ack_holdback_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -79,34 +79,20 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_forward,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = proc_dointvec,
        },
        { 0, },
 };
 
-static struct ctl_table x25_dir_table[] = {
-       {
-               .ctl_name =     NET_X25,
-               .procname =     "x25",
-               .mode =         0555,
-               .child =        x25_table,
-       },
-       { 0, },
-};
-
-static struct ctl_table x25_root_table[] = {
-       {
-               .ctl_name =     CTL_NET,
-               .procname =     "net",
-               .mode =         0555,
-               .child =        x25_dir_table,
-       },
-       { 0, },
+static struct ctl_path x25_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "x25", .ctl_name = NET_X25, },
+       { }
 };
 
 void __init x25_register_sysctl(void)
 {
-       x25_table_header = register_sysctl_table(x25_root_table, 0);
+       x25_table_header = register_sysctl_paths(x25_path, x25_table);
 }
 
 void x25_unregister_sysctl(void)