1 files changed, 6 insertions, 3 deletions

diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index 3553243bf9d6..837ff27950bc 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -64,7 +64,7 @@ void r4k_wait_irqoff(void)
         if (!need_resched())
                 __asm__(
                 "       .set    push            \n"
-                "       .set    mips3           \n"
+                "       .set    arch=r4000      \n"
                 "       wait                    \n"
                 "       .set    pop             \n");
         local_irq_enable();
@@ -82,7 +82,7 @@ static void rm7k_wait_irqoff(void)
         if (!need_resched())
                 __asm__(
                 "       .set    push                                    \n"
-                "       .set    mips3                                   \n"
+                "       .set    arch=r4000                              \n"
                 "       .set    noat                                    \n"
                 "       mfc0    $1, $12                                 \n"
                 "       sync                                            \n"
@@ -103,7 +103,7 @@ static void au1k_wait(void)
         unsigned long c0status = read_c0_status() | 1;  /* irqs on */
 
         __asm__(
-        "       .set    mips3                   \n"
+        "       .set    arch=r4000                      \n"
         "       cache   0x14, 0(%0)             \n"
         "       cache   0x14, 32(%0)            \n"
         "       sync                            \n"
@@ -184,8 +184,11 @@ void __init check_wait(void)
         case CPU_24K:
         case CPU_34K:
         case CPU_1004K:
+        case CPU_1074K:
         case CPU_INTERAPTIV:
         case CPU_PROAPTIV:
+        case CPU_P5600:
+        case CPU_M5150:
                 cpu_wait = r4k_wait;
                 if (read_c0_config7() & MIPS_CONF7_WII)
                         cpu_wait = r4k_wait_irqoff;