Merge tag 's390-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-block.git] / arch / s390 / kernel / topology.c

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 72af753d1bbaccab94628a28fa7a782ef2ced82d..9fd19530c9a5623d5901abb1dd9e2032238203ba 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -637,16 +637,6 @@ static struct ctl_table topology_ctl_table[] = {
        { },
 };
 
-static struct ctl_table topology_dir_table[] = {
-       {
-               .procname       = "s390",
-               .maxlen         = 0,
-               .mode           = 0555,
-               .child          = topology_ctl_table,
-       },
-       { },
-};
-
 static int __init topology_init(void)
 {
        struct device *dev_root;
@@ -657,7 +647,7 @@ static int __init topology_init(void)
                set_topology_timer();
        else
                topology_update_polarization_simple();
-       register_sysctl_table(topology_dir_table);
+       register_sysctl("s390", topology_ctl_table);
 
        dev_root = bus_get_dev_root(&cpu_subsys);
        if (dev_root) {