diff options
| author | Matt Redfearn <matt.redfearn@mips.com> | 2017-12-15 10:34:53 +0100 |
|---|---|---|
| committer | James Hogan <jhogan@kernel.org> | 2018-02-05 15:36:06 +0100 |
| commit | 91d9f8fcf7cc222f4bc7b5fc6496d137eadf8226 (patch) | |
| tree | 0bdfb0683a05b4a264f0fba246908335cf322572 | |
| parent | MIPS: Generic: Support GIC in EIC mode (diff) | |
| download | linux-91d9f8fcf7cc222f4bc7b5fc6496d137eadf8226.tar.xz linux-91d9f8fcf7cc222f4bc7b5fc6496d137eadf8226.zip | |
MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
The merge of commit f875a832d2028 ("MIPS: Abstract CPU core & VP(E) ID
access through accessor functions") ended up creating a duplicate
assignment of core during the rebase on commit bac06cf0fb9d ("MIPS:
smp-cps: Fix potentially uninitialised value of core"). Remove the
duplicate.
Fixes: f875a832d202 ("MIPS: Abstract CPU core & VP(E) ID access through accessor functions")
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17955/
Signed-off-by: James Hogan <jhogan@kernel.org>
| -rw-r--r-- | arch/mips/kernel/smp-cps.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index ecc1a853f48d..03f1026ad148 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c @@ -439,8 +439,6 @@ void play_dead(void) pr_debug("CPU%d going offline\n", cpu); if (cpu_has_mipsmt || cpu_has_vp) { - core = cpu_core(&cpu_data[cpu]); - /* Look for another online VPE within the core */ for_each_online_cpu(cpu_death_sibling) { if (!cpus_are_siblings(cpu, cpu_death_sibling)) |