From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 16 Aug 2007 08:56:00 +0000 (-0700)
Subject: [SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.
X-Git-Tag: v2.6.23-rc4~127^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7dc408808ad40b9a5d031966035713ed5d5153b8;p=linux-2.6-omap-h63xx.git

[SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 9448595f906..9533a25ce5d 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -95,14 +95,13 @@ spitfire_startup:
 	membar		#Sync
 
 startup_continue:
+	mov		%o0, %l0
+	BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
+
 	sethi		%hi(0x80000000), %g2
 	sllx		%g2, 32, %g2
 	wr		%g2, 0, %tick_cmpr
 
-	mov		%o0, %l0
-
-	BRANCH_IF_SUN4V(g1, niagara_lock_tlb)
-
 	/* Call OBP by hand to lock KERNBASE into i/d tlbs.
 	 * We lock 2 consequetive entries if we are 'bigkernel'.
 	 */