From be9a3583a9b1ff1c6e137b927563c8a1adeda7ad Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 16 Aug 2007 01:52:44 -0700
Subject: [PATCH] --- yaml --- r: 64084 b: refs/heads/master c:
 53140b71c5e7b5370e4ac6ffc13fddbdfae71473 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/head.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30574cc57ede..cc4d81e795b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf5adce11743e98739fcb97e76d688f0b0bc2199
+refs/heads/master: 53140b71c5e7b5370e4ac6ffc13fddbdfae71473
diff --git a/trunk/arch/sparc64/kernel/head.S b/trunk/arch/sparc64/kernel/head.S
index a2652bcfeb15..63144ad476f6 100644
--- a/trunk/arch/sparc64/kernel/head.S
+++ b/trunk/arch/sparc64/kernel/head.S
@@ -715,12 +715,13 @@ setup_trap_table:
 
 	membar	#Sync
 
+	BRANCH_IF_SUN4V(o2, 1f)
+
 	/* Kill PROM timer */
 	sethi	%hi(0x80000000), %o2
 	sllx	%o2, 32, %o2
 	wr	%o2, 0, %tick_cmpr
 
-	BRANCH_IF_SUN4V(o2, 1f)
 	BRANCH_IF_ANY_CHEETAH(o2, o3, 1f)
 
 	ba,pt	%xcc, 2f