Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 99eb8fabab60..4ceafd13870c 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -81,6 +81,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
         case CPU_PROAPTIV:
         case CPU_P5600:
         case CPU_BMIPS5000:
+        case CPU_QEMU_GENERIC:
                 if (config2 & (1 << 12))
                         return 0;
         }
@@ -104,7 +105,8 @@ static inline int __init mips_sc_probe(void)
 
         /* Ignore anything but MIPSxx processors */
         if (!(c->isa_level & (MIPS_CPU_ISA_M32R1 | MIPS_CPU_ISA_M32R2 |
-                              MIPS_CPU_ISA_M64R1 | MIPS_CPU_ISA_M64R2)))
+                              MIPS_CPU_ISA_M32R6 | MIPS_CPU_ISA_M64R1 |
+                              MIPS_CPU_ISA_M64R2 | MIPS_CPU_ISA_M64R6)))
                 return 0;
 
         /* Does this MIPS32/MIPS64 CPU have a config2 register? */