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
  ...

2 files changed, 10 insertions, 58 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e587e6819698..2b54e6c6a7c8 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2566,21 +2566,18 @@ static struct neigh_sysctl_table {
 } neigh_sysctl_template __read_mostly = {
         .neigh_vars = {
                 {
-                        .ctl_name       = NET_NEIGH_MCAST_SOLICIT,
                         .procname       = "mcast_solicit",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_UCAST_SOLICIT,
                         .procname       = "ucast_solicit",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_APP_SOLICIT,
                         .procname       = "app_solicit",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
@@ -2593,38 +2590,30 @@ static struct neigh_sysctl_table {
                         .proc_handler   = proc_dointvec_userhz_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_REACHABLE_TIME,
                         .procname       = "base_reachable_time",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_jiffies,
-                        .strategy       = sysctl_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_DELAY_PROBE_TIME,
                         .procname       = "delay_first_probe_time",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_jiffies,
-                        .strategy       = sysctl_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_GC_STALE_TIME,
                         .procname       = "gc_stale_time",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_jiffies,
-                        .strategy       = sysctl_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_UNRES_QLEN,
                         .procname       = "unres_qlen",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_PROXY_QLEN,
                         .procname       = "proxy_qlen",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
@@ -2649,45 +2638,36 @@ static struct neigh_sysctl_table {
                         .proc_handler   = proc_dointvec_userhz_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_RETRANS_TIME_MS,
                         .procname       = "retrans_time_ms",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_ms_jiffies,
-                        .strategy       = sysctl_ms_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_REACHABLE_TIME_MS,
                         .procname       = "base_reachable_time_ms",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_ms_jiffies,
-                        .strategy       = sysctl_ms_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_GC_INTERVAL,
                         .procname       = "gc_interval",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec_jiffies,
-                        .strategy       = sysctl_jiffies,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_GC_THRESH1,
                         .procname       = "gc_thresh1",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_GC_THRESH2,
                         .procname       = "gc_thresh2",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
                         .proc_handler   = proc_dointvec,
                 },
                 {
-                        .ctl_name       = NET_NEIGH_GC_THRESH3,
                         .procname       = "gc_thresh3",
                         .maxlen         = sizeof(int),
                         .mode           = 0644,
@@ -2699,7 +2679,7 @@ static struct neigh_sysctl_table {
 
 int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
                           int p_id, int pdev_id, char *p_name,
-                          proc_handler *handler, ctl_handler *strategy)
+                          proc_handler *handler)
 {
         struct neigh_sysctl_table *t;
         const char *dev_name_source = NULL;
@@ -2710,10 +2690,10 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
 #define NEIGH_CTL_PATH_DEV      3
 
         struct ctl_path neigh_path[] = {
-                { .procname = "net",     .ctl_name = CTL_NET, },
-                { .procname = "proto",   .ctl_name = 0, },
-                { .procname = "neigh",   .ctl_name = 0, },
-                { .procname = "default", .ctl_name = NET_PROTO_CONF_DEFAULT, },
+                { .procname = "net",     },
+                { .procname = "proto",   },
+                { .procname = "neigh",   },
+                { .procname = "default", },
                 { },
         };
 
@@ -2738,7 +2718,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
 
         if (dev) {
                 dev_name_source = dev->name;
-                neigh_path[NEIGH_CTL_PATH_DEV].ctl_name = dev->ifindex;
                 /* Terminate the table early */
                 memset(&t->neigh_vars[14], 0, sizeof(t->neigh_vars[14]));
         } else {
@@ -2750,31 +2729,19 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
         }
 
 
-        if (handler || strategy) {
+        if (handler) {
                 /* RetransTime */
                 t->neigh_vars[3].proc_handler = handler;
-                t->neigh_vars[3].strategy = strategy;
                 t->neigh_vars[3].extra1 = dev;
-                if (!strategy)
-                        t->neigh_vars[3].ctl_name = CTL_UNNUMBERED;
                 /* ReachableTime */
                 t->neigh_vars[4].proc_handler = handler;
-                t->neigh_vars[4].strategy = strategy;
                 t->neigh_vars[4].extra1 = dev;
-                if (!strategy)
-                        t->neigh_vars[4].ctl_name = CTL_UNNUMBERED;
                 /* RetransTime (in milliseconds)*/
                 t->neigh_vars[12].proc_handler = handler;
-                t->neigh_vars[12].strategy = strategy;
                 t->neigh_vars[12].extra1 = dev;
-                if (!strategy)
-                        t->neigh_vars[12].ctl_name = CTL_UNNUMBERED;
                 /* ReachableTime (in milliseconds) */
                 t->neigh_vars[13].proc_handler = handler;
-                t->neigh_vars[13].strategy = strategy;
                 t->neigh_vars[13].extra1 = dev;
-                if (!strategy)
-                        t->neigh_vars[13].ctl_name = CTL_UNNUMBERED;
         }
 
         t->dev_name = kstrdup(dev_name_source, GFP_KERNEL);
@@ -2782,9 +2749,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
                 goto free;
 
         neigh_path[NEIGH_CTL_PATH_DEV].procname = t->dev_name;
-        neigh_path[NEIGH_CTL_PATH_NEIGH].ctl_name = pdev_id;
         neigh_path[NEIGH_CTL_PATH_PROTO].procname = p_name;
-        neigh_path[NEIGH_CTL_PATH_PROTO].ctl_name = p_id;
 
         t->sysctl_header =
                 register_net_sysctl_table(neigh_parms_net(p), neigh_path, t->neigh_vars);
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 887c03c4e3c6..267314664813 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -19,7 +19,6 @@
 static struct ctl_table net_core_table[] = {
 #ifdef CONFIG_NET
         {
-                .ctl_name       = NET_CORE_WMEM_MAX,
                 .procname       = "wmem_max",
                 .data           = &sysctl_wmem_max,
                 .maxlen         = sizeof(int),
@@ -27,7 +26,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_RMEM_MAX,
                 .procname       = "rmem_max",
                 .data           = &sysctl_rmem_max,
                 .maxlen         = sizeof(int),
@@ -35,7 +33,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_WMEM_DEFAULT,
                 .procname       = "wmem_default",
                 .data           = &sysctl_wmem_default,
                 .maxlen         = sizeof(int),
@@ -43,7 +40,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_RMEM_DEFAULT,
                 .procname       = "rmem_default",
                 .data           = &sysctl_rmem_default,
                 .maxlen         = sizeof(int),
@@ -51,7 +47,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_DEV_WEIGHT,
                 .procname       = "dev_weight",
                 .data           = &weight_p,
                 .maxlen         = sizeof(int),
@@ -59,7 +54,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_MAX_BACKLOG,
                 .procname       = "netdev_max_backlog",
                 .data           = &netdev_max_backlog,
                 .maxlen         = sizeof(int),
@@ -67,16 +61,13 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_MSG_COST,
                 .procname       = "message_cost",
                 .data           = &net_ratelimit_state.interval,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies,
         },
         {
-                .ctl_name       = NET_CORE_MSG_BURST,
                 .procname       = "message_burst",
                 .data           = &net_ratelimit_state.burst,
                 .maxlen         = sizeof(int),
@@ -84,7 +75,6 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = NET_CORE_OPTMEM_MAX,
                 .procname       = "optmem_max",
                 .data           = &sysctl_optmem_max,
                 .maxlen         = sizeof(int),
@@ -93,7 +83,6 @@ static struct ctl_table net_core_table[] = {
         },
 #endif /* CONFIG_NET */
         {
-                .ctl_name       = NET_CORE_BUDGET,
                 .procname       = "netdev_budget",
                 .data           = &netdev_budget,
                 .maxlen         = sizeof(int),
@@ -101,31 +90,29 @@ static struct ctl_table net_core_table[] = {
                 .proc_handler   = proc_dointvec
         },
         {
-                .ctl_name       = NET_CORE_WARNINGS,
                 .procname       = "warnings",
                 .data           = &net_msg_warn,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table netns_core_table[] = {
         {
-                .ctl_name       = NET_CORE_SOMAXCONN,
                 .procname       = "somaxconn",
                 .data           = &init_net.core.sysctl_somaxconn,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 __net_initdata struct ctl_path net_core_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "core", .ctl_name = NET_CORE, },
+        { .procname = "net", },
+        { .procname = "core", },
         { },
 };