1 files changed, 13 insertions, 2 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 0fc90ba16ae1..b12eeee0e974 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -137,13 +137,24 @@ static inline void check_wait(void)
         case CPU_4KEC:
         case CPU_4KSC:
         case CPU_5KC:
-        case CPU_24K:
         case CPU_25KF:
+        case CPU_PR4450:
+                cpu_wait = r4k_wait;
+                break;
+
+        case CPU_24K:
         case CPU_34K:
+                cpu_wait = r4k_wait;
+                if (read_c0_config7() & MIPS_CONF7_WII)
+                        cpu_wait = r4k_wait_irqoff;
+                break;
+
         case CPU_74K:
-        case CPU_PR4450:
                 cpu_wait = r4k_wait;
+                if ((c->processor_id & 0xff) >= PRID_REV_ENCODE_332(2, 1, 0))
+                        cpu_wait = r4k_wait_irqoff;
                 break;
+
         case CPU_TX49XX:
                 cpu_wait = r4k_wait_irqoff;
                 break;