From a7b7742ed4a7aa324d16e913de15f47475945203 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 16 Aug 2007 01:56:00 -0700
Subject: [PATCH] --- yaml --- r: 64085 b: refs/heads/master c:
 7dc408808ad40b9a5d031966035713ed5d5153b8 h: refs/heads/master i:   64083:
 27704c9b3cbb2e3203efc47634ab3644df02f854 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sparc64/kernel/trampoline.S | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cc4d81e795b4..9be16a5b6049 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53140b71c5e7b5370e4ac6ffc13fddbdfae71473
+refs/heads/master: 7dc408808ad40b9a5d031966035713ed5d5153b8
diff --git a/trunk/arch/sparc64/kernel/trampoline.S b/trunk/arch/sparc64/kernel/trampoline.S
index 9448595f9063..9533a25ce5d2 100644
--- a/trunk/arch/sparc64/kernel/trampoline.S
+++ b/trunk/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'.
 	 */