Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[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 76a090e2c2a83ba901183fcb8f9f9e4adea3741c..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>
@@ -10,9 +12,10 @@
 #include <asm/hvtramp.h>
 #include <asm/pstate.h>
 #include <asm/ptrace.h>
+#include <asm/head.h>
 #include <asm/asi.h>
 
-       .text
+       __CPUINIT
        .align          8
        .globl          hv_cpu_startup, hv_cpu_startup_end
 
@@ -28,7 +31,7 @@
         * First setup basic privileged cpu state.
         */
 hv_cpu_startup:
-       wrpr            %g0, 0, %gl
+       SET_GL(0)
        wrpr            %g0, 15, %pil
        wrpr            %g0, 0, %canrestore
        wrpr            %g0, 0, %otherwin
@@ -114,11 +117,8 @@ hv_cpu_startup:
        call            hard_smp_processor_id
         nop
 
-       mov             %o0, %o1
-       mov             0, %o0
-       mov             0, %o2
-       call            sun4v_init_mondo_queues
-        mov            1, %o3
+       call            sun4v_register_mondo_queues
+        nop
 
        call            init_cur_cpu_trap
         mov            %g6, %o0