From bd170d4d368bbb8c3eb94b0e8d34497d187262e5 Mon Sep 17 00:00:00 2001
From: "Kevin D. Kissell" <kevink@mips.com>
Date: Fri, 3 Mar 2000 22:17:07 +0000
Subject: Fix pipe hazard in QED (Nevada) TLB miss handler.

---
 arch/mips/kernel/head.S | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index ed8140ba2..a29592763 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -1,4 +1,4 @@
-/* $Id: head.S,v 1.16 1999/10/09 00:00:58 ralf Exp $
+/* $Id: head.S,v 1.17 1999/12/04 03:58:59 ralf Exp $
  *
  * arch/mips/kernel/head.S
  *
@@ -101,7 +101,7 @@
 	eret
 	END(except_vec0_r4600)
 
-	/* TLB refill, EXL == 0, R4xx0, non-R4600 version */
+	/* TLB refill, EXL == 0, R52x0 "Nevada" version */
 	.set	noreorder
 	.set	noat
 	LEAF(except_vec0_nevada)
@@ -122,9 +122,10 @@
 	mtc0	k0, CP0_ENTRYLO0		# load it
 	srl	k1, k1, 6			# convert to entrylo1
 	mtc0	k1, CP0_ENTRYLO1		# load it
-	tlbwr					# write random tlb entry
-	nop
+	nop					# QED specified nops
 	nop
+	tlbwr					# write random tlb entry
+	nop					# traditional nop
 	eret					# return from trap
 	END(except_vec0_nevada)
 
-- 
cgit v1.2.3