summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/sun4d_smp.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-02-08 05:03:11 +0100
committerPaul Mackerras <paulus@samba.org>2007-02-08 05:03:11 +0100
commitd5112a4f31a361409d3c57dc9d58dd69f8014bef (patch)
tree64771300b2191cb94d9aaf60355661a01c2ccd1a /arch/sparc/kernel/sun4d_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)
downloadlinux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.tar.xz
linux-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/sun4d_smp.c')
-rw-r--r--arch/sparc/kernel/sun4d_smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index c80ea61e8ba0..c69de5d4863d 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void)
local_flush_cache_all();
}
-int smp4d_boot_one_cpu(int i)
+int __cpuinit smp4d_boot_one_cpu(int i)
{
extern unsigned long sun4d_cpu_startup;
unsigned long *entry = &sun4d_cpu_startup;