diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
| commit | 1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch) | |
| tree | 2d89734fc831593784bd411be03a1b9649de4c9d /arch/powerpc/kernel/smp.c | |
| parent | 6935224da2482a261c786501fbccb1dc4a675225 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
| -rw-r--r-- | arch/powerpc/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 6e19afa35a15..ec9ec2058d2d 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -541,8 +541,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) if (smp_ops->give_timebase) smp_ops->give_timebase(); - /* Wait until cpu puts itself in the online map */ - while (!cpu_online(cpu)) + /* Wait until cpu puts itself in the online & active maps */ + while (!cpu_online(cpu) || !cpu_active(cpu)) cpu_relax(); return 0; |