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

Commit 5892d6a6 authored by Matt Redfearn's avatar Matt Redfearn Committed by Ralf Baechle
Browse files

MIPS: SMP: Remove cpu_callin_map 



The previous commit made cpu_callin_map redundant, since it is no longer
used to signal secondary CPUs starting, or going offline. Remove it now.

Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Qais Yousef <qsyousef@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
Cc: Yang Shi <yang.shi@windriver.com>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14503/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a00eeede

arch/mips/cavium-octeon/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ static int octeon_cpu_disable(void) 


	set_cpu_online(cpu, false);

	calculate_cpu_foreign_map();

	cpumask_clear_cpu(cpu, &cpu_callin_map);

	octeon_fixup_irqs();



	__flush_cache_all();

arch/mips/include/asm/smp.h

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ extern int __cpu_logical_map[NR_CPUS]; 
#define SMP_DUMP		0x8

#define SMP_ASK_C0COUNT		0x10



extern cpumask_t cpu_callin_map;



/* Mask of CPUs which are currently definitely operating coherently */

extern cpumask_t cpu_coherent_mask;

arch/mips/kernel/smp-bmips.c

+0 −1
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ static int bmips_cpu_disable(void) 


	set_cpu_online(cpu, false);

	calculate_cpu_foreign_map();

	cpumask_clear_cpu(cpu, &cpu_callin_map);

	clear_c0_status(IE_IRQ5);



	local_flush_tlb_all();

arch/mips/kernel/smp-cps.c

+0 −1
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ static int cps_cpu_disable(void) 
	smp_mb__after_atomic();

	set_cpu_online(cpu, false);

	calculate_cpu_foreign_map();

	cpumask_clear_cpu(cpu, &cpu_callin_map);



	return 0;

}

arch/mips/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ 
#include <asm/setup.h>

#include <asm/maar.h>



cpumask_t cpu_callin_map;		/* Bitmask of started secondaries */



int __cpu_number_map[NR_CPUS];		/* Map physical to logical */

EXPORT_SYMBOL(__cpu_number_map);