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, 4 insertions, 9 deletions

diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 20f282c911c2..071c81f179ef 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -893,35 +893,30 @@ s390dbf_procactive(ctl_table *table, int write,
 
 static struct ctl_table s390dbf_table[] = {
         {
-                .ctl_name       = CTL_S390DBF_STOPPABLE,
                 .procname       = "debug_stoppable",
                 .data           = &debug_stoppable,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
          {
-                .ctl_name       = CTL_S390DBF_ACTIVE,
                 .procname       = "debug_active",
                 .data           = &debug_active,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &s390dbf_procactive,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = s390dbf_procactive,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table s390dbf_dir_table[] = {
         {
-                .ctl_name       = CTL_S390DBF,
                 .procname       = "s390dbf",
                 .maxlen         = 0,
                 .mode           = S_IRUGO | S_IXUGO,
                 .child          = s390dbf_table,
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_table_header *s390dbf_sysctl_header;