aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-07-13 19:22:45 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:48 +0100
commit55d04dff0fcf5d1c3f0d6edf6df86d82fa4c053b (patch)
treef046b15a3c327c486dc871a4c810d013979b4a77
parent569f75bd02d20043c4baf9fc38d937f37e7572b0 (diff)
New kernel option nowait allows disabling the use of the wait instruction.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/cpu-probe.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index e40bd6fccea..53e4496de6b 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/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: