Merge branch 'x86/urgent' into core/signal

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / hvtramp.S

diff --git a/arch/sparc64/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S
index b692e044a463420327862689d51097a60b129119..0236c43772faf50385fd5348fb4f16d34dfcc98b 100644 (file)
--- a/arch/sparc64/kernel/hvtramp.S
+++ b/arch/sparc64/kernel/hvtramp.S
@@ -3,6 +3,8 @@
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
  */
 
+#include <linux/init.h>
+
 #include <asm/thread_info.h>
 #include <asm/hypervisor.h>
 #include <asm/scratchpad.h>
@@ -13,7 +15,7 @@
 #include <asm/head.h>
 #include <asm/asi.h>
 
-       .text
+       __CPUINIT
        .align          8
        .globl          hv_cpu_startup, hv_cpu_startup_end