diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-02-08 15:03:11 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-08 15:03:11 +1100 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /arch/sparc/kernel/smp.c | |
| parent | [POWERPC] Only use H_BULK_REMOVE if the firmware supports it (diff) | |
| parent | [POWERPC] Fixup error handling when emulating a floating point instruction (diff) | |
| download | linux-dev-d5112a4f31a361409d3c57dc9d58dd69f8014bef.tar.xz linux-dev-d5112a4f31a361409d3c57dc9d58dd69f8014bef.zip | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'arch/sparc/kernel/smp.c')
| -rw-r--r-- | arch/sparc/kernel/smp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index 276f22881d0f..6b5f26b0fb75 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c @@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier) void __init smp_prepare_cpus(unsigned int max_cpus) { - extern void smp4m_boot_cpus(void); - extern void smp4d_boot_cpus(void); + extern void __init smp4m_boot_cpus(void); + extern void __init smp4d_boot_cpus(void); int i, cpuid, extra; printk("Entering SMP Mode...\n"); @@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void) int __cpuinit __cpu_up(unsigned int cpu) { - extern int smp4m_boot_one_cpu(int); - extern int smp4d_boot_one_cpu(int); + extern int __cpuinit smp4m_boot_one_cpu(int); + extern int __cpuinit smp4d_boot_one_cpu(int); int ret=0; switch(sparc_cpu_model) { |