---

yaml --- r: 180673 b: refs/heads/master c: 1f47464 h: refs/heads/master i: 180671: 7bf8981 v: v3
git-mirror · Feb 19, 2010 · c56d675 · c56d675
1 parent 7beea2e
commit c56d675
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ecfb3c2aa155c9f6152ebe91de92067d16ba6e
+refs/heads/master: 1f474646fdc36b457606bbcd6a3592e6cbd31ac4
diff --git a/trunk/arch/sparc/kernel/tsb.S b/trunk/arch/sparc/kernel/tsb.S
@@ -191,10 +191,12 @@ tsb_dtlb_load:
 
 tsb_itlb_load:
 	/* Executable bit must be set.  */
-661:	andcc		%g5, _PAGE_EXEC_4U, %g0
-	.section	.sun4v_1insn_patch, "ax"
+661:	sethi		%hi(_PAGE_EXEC_4U), %g4
+	andcc		%g5, %g4, %g0
+	.section	.sun4v_2insn_patch, "ax"
 	.word		661b
 	andcc		%g5, _PAGE_EXEC_4V, %g0
+	nop
 	.previous
 
 	be,pn		%xcc, tsb_do_fault