From d0c9c38aef549abd0ab73d30ebafde2998a73519 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 26 Jan 2007 18:48:16 -0800
Subject: [PATCH] --- yaml --- r: 45887 b: refs/heads/master c:
 86d43258bcad2068744c85181b97bb35ab27a74d h: refs/heads/master i:   45885:
 3e0c860fe10ce7ea79bd46f0c212894eeb84db38   45883:
 59dff126ee0c82d03517e93fb1d99da1497ed68c   45879:
 d862e980b2fc37cd14377ed606fe89d65bc365ad   45871:
 e2996cc7c1815c9edd10f30d815853128c61fa72   45855:
 7a8d6c6f8b62b1924a98dbaab6b4bbe01f45e98d   45823:
 3ff96a6e36170c7b85b15bbe388cc0911de672d6 v: v3

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

diff --git a/[refs] b/[refs]
index 3b834f3966c2..974a51fc0fde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c229ec5dae58b218cab0bc1b36a7647b0ec4900f
+refs/heads/master: 86d43258bcad2068744c85181b97bb35ab27a74d
diff --git a/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S b/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S
index b731881224e8..9871dbb1ab42 100644
--- a/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/trunk/arch/sparc64/kernel/sun4v_tlb_miss.S
@@ -142,9 +142,9 @@ sun4v_dtlb_prot:
 	rdpr	%tl, %g1
 	cmp	%g1, 1
 	bgu,pn	%xcc, winfix_trampoline
-	 nop
-	ba,pt	%xcc, sparc64_realfault_common
 	 mov	FAULT_CODE_DTLB | FAULT_CODE_WRITE, %g4
+	ba,pt	%xcc, sparc64_realfault_common
+	 nop
 
 	/* Called from trap table:
 	 * %g4:	vaddr