aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Redfearn <[email protected]>2017-03-31 11:51:08 +0100
committerRalf Baechle <[email protected]>2017-04-12 21:34:30 +0200
commitbac06cf0fb9dfd79877a4eaa2ec7c09a6b853ffa (patch)
tree2250f21c79055b4ca6485c123727a923a970dfc6
parentec62a3bd84df90a19b7d59d032fa807bbfea7cbb (diff)
MIPS: smp-cps: Fix potentially uninitialised value of core
Turning on DEBUG in smp-cps.c, or compiling the kernel with CONFIG_DYNAMIC_DEBUG enabled results the build error: arch/mips/kernel/smp-cps.c: In function 'play_dead': ./include/linux/dynamic_debug.h:126:3: error: 'core' may be used uninitialized in this function [-Werror=maybe-uninitialized] Fix this by always initialising the variable. Fixes: 0d2808f338c7 ("MIPS: smp-cps: Add support for CPU hotplug of MIPSr6 processors") Signed-off-by: Matt Redfearn <[email protected]> Cc: James Hogan <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Paul Burton <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Andrew Morton <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/15848/ Signed-off-by: Ralf Baechle <[email protected]>
-rw-r--r--arch/mips/kernel/smp-cps.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 6d45f05538c8..795b4aaf8927 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)