diff options
| author | Jan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de> | 2016-07-26 18:10:47 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 15:59:57 +0200 |
| commit | 66b3b5f4bb0c4811f364332d0268fbc047835d71 (patch) | |
| tree | b0231960b01e71704f67d3c0181352d08dcebdf9 /arch/powerpc | |
| parent | d7f59ace74662a703f7b079e61f9cdbc1dcb9ab3 (diff) | |
3.10.72 -> 3.10.73
Diffstat (limited to 'arch/powerpc')
| -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 ee7ac5e6e..c5c640779 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; |