Merge tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / sparc / kernel / trampoline_64.S

diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index da1b781b5e65bd8f84d210f7bdb2e9d00022ae5c..2e973a26fbda9cd9ddbc2c30017fc316eb691af4 100644 (file)
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -407,8 +407,7 @@ after_lock_tlb:
 
        call            smp_callin
         nop
-       call            cpu_idle
-        mov            0, %o0
+
        call            cpu_panic
         nop
 1:     b,a,pt          %xcc, 1b