diff options
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 0b8c25763adc..87f8d0e5e314 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -48,7 +48,6 @@  #include <asm/mach/arch.h>  #include <asm/mpu.h> -#define CREATE_TRACE_POINTS  #include <trace/events/ipi.h>  /* @@ -320,7 +319,7 @@ void __cpu_die(unsigned int cpu)   * of the other hotplug-cpu capable cores, so presumably coming   * out of idle fixes this.   */ -void arch_cpu_idle_dead(void) +void __noreturn arch_cpu_idle_dead(void)  {  	unsigned int cpu = smp_processor_id(); @@ -382,6 +381,8 @@ void arch_cpu_idle_dead(void)  		: "r" (task_stack_page(current) + THREAD_SIZE - 8),  		  "r" (current)  		: "r0"); + +	unreachable();  }  #endif /* CONFIG_HOTPLUG_CPU */ @@ -747,7 +748,7 @@ void __init set_smp_ipi_range(int ipi_base, int n)  	ipi_setup(smp_processor_id());  } -void smp_send_reschedule(int cpu) +void arch_smp_send_reschedule(int cpu)  {  	smp_cross_call(cpumask_of(cpu), IPI_RESCHEDULE);  } @@ -777,7 +778,7 @@ void smp_send_stop(void)   * kdump fails. So split out the panic_smp_self_stop() and add   * set_cpu_online(smp_processor_id(), false).   */ -void panic_smp_self_stop(void) +void __noreturn panic_smp_self_stop(void)  {  	pr_debug("CPU %u will stop doing anything useful since another CPU has paniced\n",  	         smp_processor_id());  |