[S390] topology: change default

Switch default value of the kernel parameter 'topology' from off to on.
Various performance measurements have finally shown that there are no
(known) regressions anywhere.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0b68155..b660085 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2438,7 +2438,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        topology informations if the hardware supports these.
                        The scheduler will make use of these informations and
                        e.g. base its process migration decisions on it.
-                       Default is off.
+                       Default is on.
 
        tp720=          [HW,PS2]
 

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 13559c9..eb0bc47 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -63,7 +63,7 @@ struct mask_info {
        cpumask_t mask;
 };
 
-static int topology_enabled;
+static int topology_enabled = 1;
 static void topology_work_fn(struct work_struct *work);
 static struct tl_info *tl_info;
 static int machine_has_topology;
@@ -311,9 +311,9 @@ static void set_topology_timer(void)
 
 static int __init early_parse_topology(char *p)
 {
-       if (strncmp(p, "on", 2))
+       if (strncmp(p, "off", 3))
                return 0;
-       topology_enabled = 1;
+       topology_enabled = 0;
        return 0;
 }
 early_param("topology", early_parse_topology);