---

yaml --- r: 64084 b: refs/heads/master c: 53140b7 h: refs/heads/master v: v3
git-mirror · Aug 16, 2007 · be9a358 · be9a358
1 parent 27704c9
commit be9a358
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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