sysctl s390: Remove dead sysctl binary support

Now that sys_sysctl is a generic wrapper around /proc/sys  .ctl_name
and .strategy members of sysctl tables are dead code.  Remove them.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 20f282c911c28b6ae44c64bebcb7fee85c110062..adf11260260a91d1a01d9911dff4ae98dba45b8a 100644 (file)
--- 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,
        },
         {
-               .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,
        },
-       { .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;

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index b201135cc18c25d38b5b486ca3ffa2729cffbc4d..dab3e4a7582ef7ddbee037c5b4202cc990456d7c 100644 (file)
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -355,18 +355,17 @@ static struct ctl_table cmm_table[] = {
                .mode           = 0644,
                .proc_handler   = &cmm_timeout_handler,
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 static struct ctl_table cmm_dir_table[] = {
        {
-               .ctl_name       = CTL_VM,
                .procname       = "vm",
                .maxlen         = 0,
                .mode           = 0555,
                .child          = cmm_table,
        },
-       { .ctl_name = 0 }
+       { }
 };
 #endif
 

diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c
index b44462a6c6d3d3cc0a7ccf6c14fa3f1e9e5d7bad..740fe405c3959f199ca9d393d9d912443653101b 100644 (file)
--- a/drivers/s390/char/sclp_async.c
+++ b/drivers/s390/char/sclp_async.c
@@ -101,18 +101,17 @@ static struct ctl_table callhome_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_handler_callhome,
        },
-       { .ctl_name = 0 }
+       {}
 };
 
 static struct ctl_table kern_dir_table[] = {
        {
-               .ctl_name       = CTL_KERN,
                .procname       = "kernel",
                .maxlen         = 0,
                .mode           = 0555,
                .child          = callhome_table,
        },
-       { .ctl_name = 0 }
+       {}
 };
 
 /*