summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-06-02 11:48:11 +0100
committerRalf Baechle <ralf@linux-mips.org>2006-10-09 23:20:45 +0100
commit441ee341ad63572f39cb8074e31806b5b1471d0b (patch)
tree66da0692f385f8b29982847f01c10215333d0e85 /arch/mips
parent81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 (diff)
downloadlinux-3.10-441ee341ad63572f39cb8074e31806b5b1471d0b.tar.gz
linux-3.10-441ee341ad63572f39cb8074e31806b5b1471d0b.tar.bz2
linux-3.10-441ee341ad63572f39cb8074e31806b5b1471d0b.zip
[MIPS] Fix RM9000 wait instruction detection.
Only revisions < 4.0 don't have a functional wait instruction. From Thomas Koeller (Thomas.Koeller@baslerweb.com). Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/cpu-probe.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 9fbf8430c84..8485af340ee 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -135,7 +135,6 @@ static inline void check_wait(void)
case CPU_R5000:
case CPU_NEVADA:
case CPU_RM7000:
- case CPU_RM9000:
case CPU_4KC:
case CPU_4KEC:
case CPU_4KSC:
@@ -164,6 +163,14 @@ static inline void check_wait(void)
} else
printk(" unavailable.\n");
break;
+ case CPU_RM9000:
+ if ((c->processor_id & 0x00ff) >= 0x40) {
+ cpu_wait = r4k_wait;
+ printk(" available.\n");
+ } else {
+ printk(" unavailable.\n");
+ }
+ break;
default:
printk(" unavailable.\n");
break;