diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | arch/s390/kernel/topology.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0b6815504e6d..b660085dcc69 100644 --- 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 | |||
2438 | topology informations if the hardware supports these. | 2438 | topology informations if the hardware supports these. |
2439 | The scheduler will make use of these informations and | 2439 | The scheduler will make use of these informations and |
2440 | e.g. base its process migration decisions on it. | 2440 | e.g. base its process migration decisions on it. |
2441 | Default is off. | 2441 | Default is on. |
2442 | 2442 | ||
2443 | tp720= [HW,PS2] | 2443 | tp720= [HW,PS2] |
2444 | 2444 | ||
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 13559c993847..eb0bc4752ae8 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c | |||
@@ -63,7 +63,7 @@ struct mask_info { | |||
63 | cpumask_t mask; | 63 | cpumask_t mask; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static int topology_enabled; | 66 | static int topology_enabled = 1; |
67 | static void topology_work_fn(struct work_struct *work); | 67 | static void topology_work_fn(struct work_struct *work); |
68 | static struct tl_info *tl_info; | 68 | static struct tl_info *tl_info; |
69 | static int machine_has_topology; | 69 | static int machine_has_topology; |
@@ -311,9 +311,9 @@ static void set_topology_timer(void) | |||
311 | 311 | ||
312 | static int __init early_parse_topology(char *p) | 312 | static int __init early_parse_topology(char *p) |
313 | { | 313 | { |
314 | if (strncmp(p, "on", 2)) | 314 | if (strncmp(p, "off", 3)) |
315 | return 0; | 315 | return 0; |
316 | topology_enabled = 1; | 316 | topology_enabled = 0; |
317 | return 0; | 317 | return 0; |
318 | } | 318 | } |
319 | early_param("topology", early_parse_topology); | 319 | early_param("topology", early_parse_topology); |