leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: smp: Make SMP operations mandatory

Browse Source 
Now that all SMP platforms have been converted to use struct
smp_operations, remove the "weak" attribute from the hooks
in smp.c, and make the functions static wherever possible.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Marc Zyngier 2011-09-27 14:48:23 +01:00 committed by Arnd Bergmann
parent 2d8b21d95f
commit ac6c799871
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/include/asm/smp.h
View File

@ -60,15 +60,6 @@ extern int boot_secondary(unsigned int cpu, struct task_struct *);
*/ */
asmlinkage void secondary_start_kernel(void); asmlinkage void secondary_start_kernel(void);
/*
* Perform platform specific initialisation of the specified CPU.
*/
extern void platform_secondary_init(unsigned int cpu);
/*
* Initialize cpu_possible map, and enable coherency
*/
extern void platform_smp_prepare_cpus(unsigned int);
/* /*
* Initial data for bringing up a secondary CPU. * Initial data for bringing up a secondary CPU.
@ -81,15 +72,10 @@ struct secondary_data {
extern struct secondary_data secondary_data; extern struct secondary_data secondary_data;
extern int __cpu_disable(void); extern int __cpu_disable(void);
extern int platform_cpu_disable(unsigned int cpu);
extern void __cpu_die(unsigned int cpu); extern void __cpu_die(unsigned int cpu);
extern void cpu_die(void); extern void cpu_die(void);
extern void platform_cpu_die(unsigned int cpu);
extern int platform_cpu_kill(unsigned int cpu);
extern void platform_cpu_enable(unsigned int cpu);
extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_single_ipi(int cpu);
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);

18
arch/arm/kernel/smp.c
View File

@ -110,25 +110,25 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
} }
/* platform specific SMP operations */ /* platform specific SMP operations */
void __attribute__((weak)) __init smp_init_cpus(void) void __init smp_init_cpus(void)
{ {
if (smp_ops.smp_init_cpus) if (smp_ops.smp_init_cpus)
smp_ops.smp_init_cpus(); smp_ops.smp_init_cpus();
} }
void __attribute__((weak)) __init platform_smp_prepare_cpus(unsigned int max_cpus) static void __init platform_smp_prepare_cpus(unsigned int max_cpus)
{ {
if (smp_ops.smp_prepare_cpus) if (smp_ops.smp_prepare_cpus)
smp_ops.smp_prepare_cpus(max_cpus); smp_ops.smp_prepare_cpus(max_cpus);
} }
void __attribute__((weak)) __cpuinit platform_secondary_init(unsigned int cpu) static void __cpuinit platform_secondary_init(unsigned int cpu)
{ {
if (smp_ops.smp_secondary_init) if (smp_ops.smp_secondary_init)
smp_ops.smp_secondary_init(cpu); smp_ops.smp_secondary_init(cpu);
} }
int __attribute__((weak)) __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
{ {
if (smp_ops.smp_boot_secondary) if (smp_ops.smp_boot_secondary)
return smp_ops.smp_boot_secondary(cpu, idle); return smp_ops.smp_boot_secondary(cpu, idle);
@ -138,20 +138,20 @@ int __attribute__((weak)) __cpuinit boot_secondary(unsigned int cpu, struct task
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
static void percpu_timer_stop(void); static void percpu_timer_stop(void);
int __attribute__((weak)) platform_cpu_kill(unsigned int cpu) static int platform_cpu_kill(unsigned int cpu)
{ {
if (smp_ops.cpu_kill) if (smp_ops.cpu_kill)
return smp_ops.cpu_kill(cpu); return smp_ops.cpu_kill(cpu);
return 1; return 1;
} }
void __attribute__((weak)) platform_cpu_die(unsigned int cpu) static void platform_cpu_die(unsigned int cpu)
{ {
if (smp_ops.cpu_die) if (smp_ops.cpu_die)
smp_ops.cpu_die(cpu); smp_ops.cpu_die(cpu);
} }
int __attribute__((weak)) platform_cpu_disable(unsigned int cpu) static int platform_cpu_disable(unsigned int cpu)
{ {
if (smp_ops.cpu_disable) if (smp_ops.cpu_disable)
return smp_ops.cpu_disable(cpu); return smp_ops.cpu_disable(cpu);
@ -166,7 +166,7 @@ int __attribute__((weak)) platform_cpu_disable(unsigned int cpu)
/* /*
* __cpu_disable runs on the processor to be shutdown. * __cpu_disable runs on the processor to be shutdown.
*/ */
int __cpu_disable(void) int __cpuinit __cpu_disable(void)
{ {
unsigned int cpu = smp_processor_id(); unsigned int cpu = smp_processor_id();
int ret; int ret;
@ -209,7 +209,7 @@ static DECLARE_COMPLETION(cpu_died);
* called on the thread which is asking for a CPU to be shutdown - * called on the thread which is asking for a CPU to be shutdown -
* waits until shutdown has completed, or it is timed out. * waits until shutdown has completed, or it is timed out.
*/ */
void __cpu_die(unsigned int cpu) void __cpuinit __cpu_die(unsigned int cpu)
{ {
if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
pr_err("CPU%u: cpu didn't die\n", cpu); pr_err("CPU%u: cpu didn't die\n", cpu);