From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 2 Jun 2006 10:48:11 +0000 (+0100)
Subject: [MIPS] Fix RM9000 wait instruction detection.
X-Git-Tag: v2.6.19-rc2~217
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=441ee341ad63572f39cb8074e31806b5b1471d0b;p=linux-2.6-omap-h63xx.git

[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>
---

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;