[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1513330494-21249-1-git-send-email-matt.redfearn@mips.com>
Date: Fri, 15 Dec 2017 09:34:53 +0000
From: Matt Redfearn <matt.redfearn@...s.com>
To: Ralf Baechle <ralf@...ux-mips.org>, <jhogan@...nel.org>
CC: <linux-mips@...ux-mips.org>,
Matt Redfearn <matt.redfearn@...s.com>,
Dengcheng Zhu <dengcheng.zhu@...s.com>,
<linux-kernel@...r.kernel.org>,
"Paul Burton" <paul.burton@...s.com>,
Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 1/2] 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.
Signed-off-by: Matt Redfearn <matt.redfearn@...s.com>
---
arch/mips/kernel/smp-cps.c | 2 --
1 file changed, 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))
--
2.7.4
Powered by blists - more mailing lists