Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 91d9f8fc authored by Matt Redfearn's avatar Matt Redfearn Committed by James Hogan
Browse files

MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead 



The merge of commit f875a832 ("MIPS: Abstract CPU core & VP(E) ID
access through accessor functions") ended up creating a duplicate
assignment of core during the rebase on commit bac06cf0 ("MIPS:
smp-cps: Fix potentially uninitialised value of core"). Remove the
duplicate.

Fixes: f875a832 ("MIPS: Abstract CPU core & VP(E) ID access through accessor functions")
Signed-off-by: default avatarMatt 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: default avatarJames Hogan <jhogan@kernel.org>
parent 7bf8b16d

arch/mips/kernel/smp-cps.c

+0 −2
Original line number Diff line number Diff line
@@ -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))