diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-04-14 15:36:25 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-04-14 15:37:26 +0200 |
| commit | 88e012856d05a5d00ae80c691fb7aa5adda268d7 (patch) | |
| tree | 2f0fccb3ffa9eaa3c93ae81f6031c083228106c1 /arch | |
| parent | 52db45c3c55a0fca53077dfd7b123e30cd210aad (diff) | |
| download | op-kernel-dev-88e012856d05a5d00ae80c691fb7aa5adda268d7.zip op-kernel-dev-88e012856d05a5d00ae80c691fb7aa5adda268d7.tar.gz | |
[S390] smp: fix cpu_possible_map initialization
The cpu_possible_map by default is initialized with all ones in s390.
If the kernel paramert possible_cpus=<x> is passed the cpu_possible_map
is supposed to have x bits set.
However the current code just sets the x bits without clearing the NR_CPUS
bits that were already set. So we end up with an unchanged map that has
all bits set.
To fix this just clear the map before setting any new bits.
This broke with def6cfb70bab83c0094bc0cedd27c4eda563043e
"[S390] cpumask: Use accessors code."
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/smp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 7966302..a985a3b 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -591,7 +591,8 @@ static int __init setup_possible_cpus(char *s) int pcpus, cpu; pcpus = simple_strtoul(s, NULL, 0); - for (cpu = 0; cpu < pcpus && cpu < nr_cpu_ids; cpu++) + init_cpu_possible(cpumask_of(0)); + for (cpu = 1; cpu < pcpus && cpu < nr_cpu_ids; cpu++) set_cpu_possible(cpu, true); return 0; } |
