diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
| commit | 88720d8b842c59efcc0c4dc17e2107f4dae502f5 (patch) | |
| tree | 967e60ace88cd9e4f9819042eedf3be6a445bb54 /arch/powerpc/kernel | |
| parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) | |
| parent | 73895725a9401bd3454757fcfa7d691270ac7498 (diff) | |
Merge tag 'v3.10.73' into linux-linaro-lskHEADlinux-linaro-lsk
This is the 3.10.73 stable release
Diffstat (limited to 'arch/powerpc/kernel')
| -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 ee7ac5e6e28a..c5c640779549 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -544,8 +544,8 @@ int __cpuinit __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; |