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, 7 insertions, 18 deletions

diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index 8ac9b8424007..346485910732 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -22,47 +22,42 @@ static unsigned int isa_membase, isa_portbase, isa_portshift;
 
 static ctl_table ctl_isa_vars[4] = {
         {
-                .ctl_name       = BUS_ISA_MEM_BASE,
                 .procname       = "membase",
                 .data           = &isa_membase, 
                 .maxlen         = sizeof(isa_membase),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         }, {
-                .ctl_name       = BUS_ISA_PORT_BASE,
                 .procname       = "portbase",
                 .data           = &isa_portbase, 
                 .maxlen         = sizeof(isa_portbase),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         }, {
-                .ctl_name       = BUS_ISA_PORT_SHIFT,
                 .procname       = "portshift",
                 .data           = &isa_portshift, 
                 .maxlen         = sizeof(isa_portshift),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
-        }, {0}
+                .proc_handler   = proc_dointvec,
+        }, {}
 };
 
 static struct ctl_table_header *isa_sysctl_header;
 
 static ctl_table ctl_isa[2] = {
         {
-                .ctl_name       = CTL_BUS_ISA,
                 .procname       = "isa",
                 .mode           = 0555,
                 .child          = ctl_isa_vars,
-        }, {0}
+        }, {}
 };
 
 static ctl_table ctl_bus[2] = {
         {
-                .ctl_name       = CTL_BUS,
                 .procname       = "bus",
                 .mode           = 0555,
                 .child          = ctl_isa,
-        }, {0}
+        }, {}
 };
 
 void __init
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index 0da693b0f7e1..fbe6fa02c882 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -47,10 +47,6 @@ HW_DECLARE_SPINLOCK(gpio)
     EXPORT_SYMBOL(bcmring_gpio_reg_lock);
 #endif
 
-/* FIXME: temporary solution */
-#define BCM_SYSCTL_REBOOT_WARM               1
-#define CTL_BCM_REBOOT                 112
-
 /* sysctl */
 int bcmring_arch_warm_reboot;   /* do a warm reboot on hard reset */
 
@@ -58,18 +54,16 @@ static struct ctl_table_header *bcmring_sysctl_header;
 
 static struct ctl_table bcmring_sysctl_warm_reboot[] = {
         {
-         .ctl_name = BCM_SYSCTL_REBOOT_WARM,
          .procname = "warm",
          .data = &bcmring_arch_warm_reboot,
          .maxlen = sizeof(int),
          .mode = 0644,
-         .proc_handler = &proc_dointvec},
+         .proc_handler = proc_dointvec},
         {}
 };
 
 static struct ctl_table bcmring_sysctl_reboot[] = {
         {
-         .ctl_name = CTL_BCM_REBOOT,
          .procname = "reboot",
          .mode = 0555,
          .child = bcmring_sysctl_warm_reboot},