diff options
| author | Matt Evans <matt@ozlabs.org> | 2011-05-25 14:09:12 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-17 02:19:51 -0400 |
| commit | 7ac87abb8166b99584149fcfb2efef5773a078e9 (patch) | |
| tree | 626ccec24e00720ada0bd8f967922d935f0eeca8 /arch/powerpc/kernel/head_64.S | |
| parent | 32d206eb5637d8cf73d9c70f7680de2a7193ce8b (diff) | |
powerpc: Fix early boot accounting of CPUs
smp_release_cpus() waits for all cpus (including the bootcpu) due to an
off-by-one count on boot_cpu_count (which is all CPUs). This patch replaces
that with spinning_secondaries (which is all secondary CPUs).
Signed-off-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index ba504099844a..3564c49c683e 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -255,7 +255,7 @@ generic_secondary_common_init: | |||
| 255 | mtctr r23 | 255 | mtctr r23 |
| 256 | bctrl | 256 | bctrl |
| 257 | 257 | ||
| 258 | 3: LOAD_REG_ADDR(r3, boot_cpu_count) /* Decrement boot_cpu_count */ | 258 | 3: LOAD_REG_ADDR(r3, spinning_secondaries) /* Decrement spinning_secondaries */ |
| 259 | lwarx r4,0,r3 | 259 | lwarx r4,0,r3 |
| 260 | subi r4,r4,1 | 260 | subi r4,r4,1 |
| 261 | stwcx. r4,0,r3 | 261 | stwcx. r4,0,r3 |