diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-20 16:46:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-21 11:09:05 +0100 |
| commit | 573619d165b85152eeddd3b3871002c48cd94e42 (patch) | |
| tree | ee74480fe8ae9d09ace5cb1dd97bf1ea525249bc /arch/arm/kernel | |
| parent | 9a00318eadbb43db4e9c163c262a22a3c8b5a672 (diff) | |
| download | blackbird-op-linux-573619d165b85152eeddd3b3871002c48cd94e42.tar.gz blackbird-op-linux-573619d165b85152eeddd3b3871002c48cd94e42.zip | |
ARM: SMP: wait for CPU to be marked active
When we bring a CPU online, we should wait for it to become active
before entering the idle thread, so we know that the scheduler and
thread migration is going to work.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 344e52b16c8c..e7f92a4321f3 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -318,9 +318,13 @@ asmlinkage void __cpuinit secondary_start_kernel(void) smp_store_cpu_info(cpu); /* - * OK, now it's safe to let the boot CPU continue + * OK, now it's safe to let the boot CPU continue. Wait for + * the CPU migration code to notice that the CPU is online + * before we continue. */ set_cpu_online(cpu, true); + while (!cpu_active(cpu)) + cpu_relax(); /* * OK, it's off to the idle thread for us |
