diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 10:11:06 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 10:11:06 +0100 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /arch/alpha/kernel/smp.c | |
| parent | Merge branch 'linux-2.6' into next (diff) | |
| parent | powerpc: Fix dma_map_sg() cache flushing on non coherent platforms (diff) | |
| download | linux-527491885554002837b5742202adc0ab5f536e54.tar.xz linux-527491885554002837b5742202adc0ab5f536e54.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/alpha/kernel/smp.c')
| -rw-r--r-- | arch/alpha/kernel/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index e657c45d91d2..cf7da10097bb 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -121,7 +121,7 @@ wait_boot_cpu_to_stop(int cpuid) /* * Where secondaries begin a life of C. */ -void __init +void __cpuinit smp_callin(void) { int cpuid = hard_smp_processor_id(); @@ -198,7 +198,7 @@ wait_for_txrdy (unsigned long cpumask) * Send a message to a secondary's console. "START" is one such * interesting message. ;-) */ -static void __init +static void __cpuinit send_secondary_console_msg(char *str, int cpuid) { struct percpu_struct *cpu; @@ -289,7 +289,7 @@ recv_secondary_console_msg(void) /* * Convince the console to have a secondary cpu begin execution. */ -static int __init +static int __cpuinit secondary_cpu_start(int cpuid, struct task_struct *idle) { struct percpu_struct *cpu; |