diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
| commit | e469b23cdec0fc8c49102882920e3951530e1740 (patch) | |
| tree | 7ef4e37f4c576c984157e897e7a461cea13f5983 /arch/mips/kernel/smp-cps.c | |
| parent | MIPS: Remove confusing else statement in __do_page_fault() (diff) | |
| parent | MIPS: KGDB: Use kernel context for sleeping threads (diff) | |
| download | linux-e469b23cdec0fc8c49102882920e3951530e1740.tar.xz linux-e469b23cdec0fc8c49102882920e3951530e1740.zip | |
Merge branch '4.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/smp-cps.c')
| -rw-r--r-- | arch/mips/kernel/smp-cps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index 306b4a64cb8f..36954ddd0b9f 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c @@ -422,13 +422,12 @@ void play_dead(void) local_irq_disable(); idle_task_exit(); cpu = smp_processor_id(); + core = cpu_data[cpu].core; cpu_death = CPU_DEATH_POWER; pr_debug("CPU%d going offline\n", cpu); if (cpu_has_mipsmt || cpu_has_vp) { - core = cpu_data[cpu].core; - /* Look for another online VPE within the core */ for_each_online_cpu(cpu_death_sibling) { if (cpu_data[cpu_death_sibling].core != core) |