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

Commit 9205b797 authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King
Browse files

ARM: 8421/1: smp: Collapse arch_cpu_idle_dead() into cpu_die() 



The only caller of cpu_die() on ARM is arch_cpu_idle_dead(), so
let's simplify the code by renaming cpu_die() to
arch_cpu_idle_dead(). While were here, drop the __ref annotation
because __cpuinit is gone nowadays.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 96231b26

arch/arm/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ extern void secondary_startup_arm(void); 
extern int __cpu_disable(void);



extern void __cpu_die(unsigned int cpu);

extern void cpu_die(void);



extern void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

arch/arm/kernel/process.c

+0 −7
Original line number Diff line number Diff line
@@ -91,13 +91,6 @@ void arch_cpu_idle_exit(void) 
	ledtrig_cpu(CPU_LED_IDLE_END);

}



#ifdef CONFIG_HOTPLUG_CPU

void arch_cpu_idle_dead(void)

{

	cpu_die();

}

#endif



void __show_regs(struct pt_regs *regs)

{

	unsigned long flags;

arch/arm/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ void __cpu_die(unsigned int cpu) 
 * of the other hotplug-cpu capable cores, so presumably coming

 * out of idle fixes this.

 */

void __ref cpu_die(void)

void arch_cpu_idle_dead(void)

{

	unsigned int cpu = smp_processor_id();