alpha: fix module load failures on smp (bug #10926)

[linux-2.6] / net / rose / sysctl_net_rose.c

diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 8548c7cf564367d7f93ba59cc59524dda5b82821..20be3485a97f9981971481b0915a01157e0e24e1 100644 (file)
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -25,7 +25,7 @@ static int min_window[] = {1}, max_window[] = {7};
 static struct ctl_table_header *rose_table_header;
 
 static ctl_table rose_table[] = {
-        {
+       {
                .ctl_name       = NET_ROSE_RESTART_REQUEST_TIMEOUT,
                .procname       = "restart_request_timeout",
                .data           = &sysctl_rose_restart_request_timeout,
@@ -36,7 +36,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_timer,
                .extra2         = &max_timer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_CALL_REQUEST_TIMEOUT,
                .procname       = "call_request_timeout",
                .data           = &sysctl_rose_call_request_timeout,
@@ -47,7 +47,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_timer,
                .extra2         = &max_timer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_RESET_REQUEST_TIMEOUT,
                .procname       = "reset_request_timeout",
                .data           = &sysctl_rose_reset_request_timeout,
@@ -58,7 +58,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_timer,
                .extra2         = &max_timer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_CLEAR_REQUEST_TIMEOUT,
                .procname       = "clear_request_timeout",
                .data           = &sysctl_rose_clear_request_timeout,
@@ -69,7 +69,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_timer,
                .extra2         = &max_timer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_NO_ACTIVITY_TIMEOUT,
                .procname       = "no_activity_timeout",
                .data           = &sysctl_rose_no_activity_timeout,
@@ -80,7 +80,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_idle,
                .extra2         = &max_idle
        },
-        {
+       {
                .ctl_name       = NET_ROSE_ACK_HOLD_BACK_TIMEOUT,
                .procname       = "acknowledge_hold_back_timeout",
                .data           = &sysctl_rose_ack_hold_back_timeout,
@@ -91,7 +91,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_timer,
                .extra2         = &max_timer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_ROUTING_CONTROL,
                .procname       = "routing_control",
                .data           = &sysctl_rose_routing_control,
@@ -102,7 +102,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_route,
                .extra2         = &max_route
        },
-        {
+       {
                .ctl_name       = NET_ROSE_LINK_FAIL_TIMEOUT,
                .procname       = "link_fail_timeout",
                .data           = &sysctl_rose_link_fail_timeout,
@@ -113,7 +113,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_ftimer,
                .extra2         = &max_ftimer
        },
-        {
+       {
                .ctl_name       = NET_ROSE_MAX_VCS,
                .procname       = "maximum_virtual_circuits",
                .data           = &sysctl_rose_maximum_vcs,
@@ -124,7 +124,7 @@ static ctl_table rose_table[] = {
                .extra1         = &min_maxvcs,
                .extra2         = &max_maxvcs
        },
-        {
+       {
                .ctl_name       = NET_ROSE_WINDOW_SIZE,
                .procname       = "window_size",
                .data           = &sysctl_rose_window_size,
@@ -138,29 +138,15 @@ static ctl_table rose_table[] = {
        { .ctl_name = 0 }
 };
 
-static ctl_table rose_dir_table[] = {
-       {
-               .ctl_name       = NET_ROSE,
-               .procname       = "rose",
-               .mode           = 0555,
-               .child          = rose_table
-       },
-       { .ctl_name = 0 }
-};
-
-static ctl_table rose_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = rose_dir_table
-       },
-       { .ctl_name = 0 }
+static struct ctl_path rose_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "rose", .ctl_name = NET_ROSE, },
+       { }
 };
 
 void __init rose_register_sysctl(void)
 {
-       rose_table_header = register_sysctl_table(rose_root_table, 1);
+       rose_table_header = register_sysctl_paths(rose_path, rose_table);
 }
 
 void rose_unregister_sysctl(void)