summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/trampoline.S
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-11-22 17:33:54 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-30 10:03:35 -0800
commit409832f5484cd1e2d8812c3236dffb33d01c359b (patch)
tree855b5e4cb8bc8c2120d43c3478f9e47696b84fb5 /arch/sparc/kernel/trampoline.S
parent4ea8fb9c1cc67bee980dca589ec8d0d4e62858c7 (diff)
sparc32 cpuinit flase positives
All noise since we don't have CPU hotplug there. However, they did expose something very odd-looking in there - poke_viking() does a bunch of identical btfixup each time it's called (i.e. for each CPU). That one is left alone for now; just the trivial misannotation fixes. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc/kernel/trampoline.S')
-rw-r--r--arch/sparc/kernel/trampoline.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S
index 356c56aebc62..5e235c52d667 100644
--- a/arch/sparc/kernel/trampoline.S
+++ b/arch/sparc/kernel/trampoline.S
@@ -18,7 +18,7 @@
.globl sun4m_cpu_startup, __smp4m_processor_id
.globl sun4d_cpu_startup, __smp4d_processor_id
- __INIT
+ __CPUINIT
.align 4
/* When we start up a cpu for the first time it enters this routine.
@@ -109,7 +109,7 @@ __smp4d_processor_id:
/* CPUID in bootbus can be found at PA 0xff0140000 */
#define SUN4D_BOOTBUS_CPUID 0xf0140000
- __INIT
+ __CPUINIT
.align 4
sun4d_cpu_startup: