summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-03-08 14:49:33 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-04-01 15:37:36 +1100
commitaeeafbfa7a5692c68d306043878aa2dd785e5230 (patch)
treec217eaab7fc94939e7332c23454c63092cd48dce /arch
parentc56e58537d504706954a06570b4034c04e5b7500 (diff)
downloadlinux-3.10-aeeafbfa7a5692c68d306043878aa2dd785e5230.tar.gz
linux-3.10-aeeafbfa7a5692c68d306043878aa2dd785e5230.tar.bz2
linux-3.10-aeeafbfa7a5692c68d306043878aa2dd785e5230.zip
powerpc/smp: Increase vdso_data->processorCount, not just decrease it
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/smp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 54faff91b80..cbdbb14be4b 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -551,6 +551,10 @@ void __devinit start_secondary(void *unused)
secondary_cpu_time_init();
+#ifdef CONFIG_PPC64
+ if (system_state == SYSTEM_RUNNING)
+ vdso_data->processorCount++;
+#endif
ipi_call_lock();
notify_cpu_starting(cpu);
set_cpu_online(cpu, true);