summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-08 22:36:44 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-08 22:36:44 +0000
commitc3f18c6201e8ad4244e8ad83d168cde68a7286fa (patch)
tree0e0afca4ce662f7039939f6a3995c278c77fbfa3
parentf2e5fade838d1708f8848c6c5c82cec4f92742e1 (diff)
Undo broken segment of MIPS patch.
-rw-r--r--arch/mips/kernel/head.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index 890a1bf33..529ebb57d 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -1,5 +1,4 @@
-/* $Id: head.S,v 1.18 2000/03/03 22:17:07 kevink Exp $
- *
+/*
* arch/mips/kernel/head.S
*
* This file is subject to the terms and conditions of the GNU General Public
@@ -76,9 +75,9 @@
mtc0 k0, CP0_ENTRYLO0 # load it
srl k1, k1, 6 # convert to entrylo1
mtc0 k1, CP0_ENTRYLO1 # load it
- nop # Need 2 cycles between mtc0
- nop # and tlbwr (CP0 hazard).
+ b 1f
tlbwr # write random tlb entry
+1:
nop
eret # return from trap
END(except_vec0_r4000)