diff options
| author | Kevin D. Kissell <kevink@mips.com> | 2000-03-03 22:17:07 +0000 |
|---|---|---|
| committer | Kevin D. Kissell <kevink@mips.com> | 2000-03-03 22:17:07 +0000 |
| commit | bd170d4d368bbb8c3eb94b0e8d34497d187262e5 (patch) | |
| tree | 52941275ce0c1b322608f7a09922fd804638b23e | |
| parent | b0c9e54a0e5faa7e6eb8a421cf2edb663c126de2 (diff) | |
Fix pipe hazard in QED (Nevada) TLB miss handler.
| -rw-r--r-- | arch/mips/kernel/head.S | 9 |
1 files 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) |