From 0abcfb1afb255e10f1e09157115c72dba931fd77 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 13 Jul 2005 19:22:45 +0000
Subject: [PATCH] --- yaml --- r: 11156 b: refs/heads/master c:
 55d04dff0fcf5d1c3f0d6edf6df86d82fa4c053b h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/mips/kernel/cpu-probe.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64f64a54e3a3..2b11a20f7872 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 569f75bd02d20043c4baf9fc38d937f37e7572b0
+refs/heads/master: 55d04dff0fcf5d1c3f0d6edf6df86d82fa4c053b
diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c
index e40bd6fccea5..53e4496de6b6 100644
--- a/trunk/arch/mips/kernel/cpu-probe.c
+++ b/trunk/arch/mips/kernel/cpu-probe.c
@@ -71,11 +71,27 @@ static void au1k_wait(void)
 		: : "r" (au1k_wait));
 }
 
+static int __initdata nowait = 0;
+
+int __init wait_disable(char *s)
+{
+	nowait = 1;
+
+	return 1;
+}
+
+__setup("nowait", wait_disable);
+
 static inline void check_wait(void)
 {
 	struct cpuinfo_mips *c = &current_cpu_data;
 
 	printk("Checking for 'wait' instruction... ");
+	if (nowait) {
+		printk (" disabled.\n");
+		return;
+	}
+
 	switch (c->cputype) {
 	case CPU_R3081:
 	case CPU_R3081E: