diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-03 17:40:15 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-29 16:10:49 -0400 |
| commit | 4277ff5ee55694f67d9c6586bb4c06991e221a68 (patch) | |
| tree | c75ff9101d0dc14688c86f709370d3e122e7402a /arch/mips/kernel/entry.S | |
| parent | b4ab24e1c8c1442b2928bab1325b56bdbbcf898e (diff) | |
[MIPS] Fix use of ehb instruction for non-R2 configurations.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/entry.S')
| -rw-r--r-- | arch/mips/kernel/entry.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index a9c6de1b9542..457565162dd5 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S | |||
| @@ -87,7 +87,7 @@ FEXPORT(restore_all) # restore full frame | |||
| 87 | ori v1, v0, TCSTATUS_IXMT | 87 | ori v1, v0, TCSTATUS_IXMT |
| 88 | mtc0 v1, CP0_TCSTATUS | 88 | mtc0 v1, CP0_TCSTATUS |
| 89 | andi v0, TCSTATUS_IXMT | 89 | andi v0, TCSTATUS_IXMT |
| 90 | ehb | 90 | _ehb |
| 91 | mfc0 t0, CP0_TCCONTEXT | 91 | mfc0 t0, CP0_TCCONTEXT |
| 92 | DMT 9 # dmt t1 | 92 | DMT 9 # dmt t1 |
| 93 | jal mips_ihb | 93 | jal mips_ihb |
| @@ -95,7 +95,7 @@ FEXPORT(restore_all) # restore full frame | |||
| 95 | andi t3, t0, 0xff00 | 95 | andi t3, t0, 0xff00 |
| 96 | or t2, t2, t3 | 96 | or t2, t2, t3 |
| 97 | mtc0 t2, CP0_STATUS | 97 | mtc0 t2, CP0_STATUS |
| 98 | ehb | 98 | _ehb |
| 99 | andi t1, t1, VPECONTROL_TE | 99 | andi t1, t1, VPECONTROL_TE |
| 100 | beqz t1, 1f | 100 | beqz t1, 1f |
| 101 | EMT | 101 | EMT |
| @@ -105,7 +105,7 @@ FEXPORT(restore_all) # restore full frame | |||
| 105 | xori v1, v1, TCSTATUS_IXMT | 105 | xori v1, v1, TCSTATUS_IXMT |
| 106 | or v1, v0, v1 | 106 | or v1, v0, v1 |
| 107 | mtc0 v1, CP0_TCSTATUS | 107 | mtc0 v1, CP0_TCSTATUS |
| 108 | ehb | 108 | _ehb |
| 109 | xor t0, t0, t3 | 109 | xor t0, t0, t3 |
| 110 | mtc0 t0, CP0_TCCONTEXT | 110 | mtc0 t0, CP0_TCCONTEXT |
| 111 | #endif /* CONFIG_MIPS_MT_SMTC */ | 111 | #endif /* CONFIG_MIPS_MT_SMTC */ |