commit 55d04dff0fcf5d1c3f0d6edf6df86d82fa4c053b
author Ralf Baechle <ralf@linux-mips.org> Wed Jul 13 19:22:45 2005 +0000
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:31:48 2005 +0100
tree f046b15a3c327c486dc871a4c810d013979b4a77
parent 569f75bd02d20043c4baf9fc38d937f37e7572b0

New kernel option nowait allows disabling the use of the wait instruction.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/cpu-probe.c

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index e40bd6f..53e4496 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -71,11 +71,27 @@
 		: : "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: