From 2c7283d5a47ab46996b8db345c28966d6c14da50 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 14 Sep 2007 19:08:43 +0100 Subject: [PATCH] --- yaml --- r: 64937 b: refs/heads/master c: 50da469a79fa2152d824f25f5ad5962f4af4343d h: refs/heads/master i: 64935: 4b8b786ca936ba67735c31aa2839f598c6ed00df v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cpu-probe.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a8d262bfb974..c4b1d61d8f79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8df5beac2aa15b18a912ab585e1b86e748eda9ad +refs/heads/master: 50da469a79fa2152d824f25f5ad5962f4af4343d diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c index 06448a9656dc..3e004161ebd5 100644 --- a/trunk/arch/mips/kernel/cpu-probe.c +++ b/trunk/arch/mips/kernel/cpu-probe.c @@ -199,7 +199,14 @@ static inline void check_wait(void) if ((c->processor_id & 0xff) <= 0x64) break; - cpu_wait = r4k_wait; + /* + * Another rev is incremeting c0_count at a reduced clock + * rate while in WAIT mode. So we basically have the choice + * between using the cp0 timer as clocksource or avoiding + * the WAIT instruction. Until more details are known, + * disable the use of WAIT for 20Kc entirely. + cpu_wait = r4k_wait; + */ break; case CPU_RM9000: if ((c->processor_id & 0x00ff) >= 0x40)