Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
  security/tomoyo: Remove now unnecessary handling of security_sysctl.
  security/tomoyo: Add a special case to handle accesses through the internal proc mount.
  sysctl: Drop & in front of every proc_handler.
  sysctl: Remove CTL_NONE and CTL_UNNUMBERED
  sysctl: kill dead ctl_handler definitions.
  sysctl: Remove the last of the generic binary sysctl support
  sysctl net: Remove unused binary sysctl code
  sysctl security/tomoyo: Don't look at ctl_name
  sysctl arm: Remove binary sysctl support
  sysctl x86: Remove dead binary sysctl support
  sysctl sh: Remove dead binary sysctl support
  sysctl powerpc: Remove dead binary sysctl support
  sysctl ia64: Remove dead binary sysctl support
  sysctl s390: Remove dead sysctl binary support
  sysctl frv: Remove dead binary sysctl support
  sysctl mips/lasat: Remove dead binary sysctl support
  sysctl drivers: Remove dead binary sysctl support
  sysctl crypto: Remove dead binary sysctl support
  sysctl security/keys: Remove dead binary sysctl support
  sysctl kernel: Remove binary sysctl logic
  ...

1 files changed, 3 insertions, 23 deletions

diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 3bfe504faf86..df6d9dac2186 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -26,121 +26,101 @@ 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,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_CALL_REQUEST_TIMEOUT,
                 .procname       = "call_request_timeout",
                 .data           = &sysctl_rose_call_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_RESET_REQUEST_TIMEOUT,
                 .procname       = "reset_request_timeout",
                 .data           = &sysctl_rose_reset_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_CLEAR_REQUEST_TIMEOUT,
                 .procname       = "clear_request_timeout",
                 .data           = &sysctl_rose_clear_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_NO_ACTIVITY_TIMEOUT,
                 .procname       = "no_activity_timeout",
                 .data           = &sysctl_rose_no_activity_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .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,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_ROUTING_CONTROL,
                 .procname       = "routing_control",
                 .data           = &sysctl_rose_routing_control,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_route,
                 .extra2         = &max_route
         },
         {
-                .ctl_name       = NET_ROSE_LINK_FAIL_TIMEOUT,
                 .procname       = "link_fail_timeout",
                 .data           = &sysctl_rose_link_fail_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_ftimer,
                 .extra2         = &max_ftimer
         },
         {
-                .ctl_name       = NET_ROSE_MAX_VCS,
                 .procname       = "maximum_virtual_circuits",
                 .data           = &sysctl_rose_maximum_vcs,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_maxvcs,
                 .extra2         = &max_maxvcs
         },
         {
-                .ctl_name       = NET_ROSE_WINDOW_SIZE,
                 .procname       = "window_size",
                 .data           = &sysctl_rose_window_size,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_window,
                 .extra2         = &max_window
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_path rose_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "rose", .ctl_name = NET_ROSE, },
+        { .procname = "net", },
+        { .procname = "rose", },
         { }
 };