Merge tag 'mips_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index cbab46004e99d4f07c1eb9a10c16bba3b5cb992f..42d411125690fa7c31950d6618c76c0d5798e59c 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2223,7 +2223,9 @@ void per_cpu_trap_init(bool is_boot_cpu)
                cp0_fdc_irq = -1;
        }
 
-       if (!cpu_data[cpu].asid_cache)
+       if (cpu_has_mmid)
+               cpu_data[cpu].asid_cache = 0;
+       else if (!cpu_data[cpu].asid_cache)
                cpu_data[cpu].asid_cache = asid_first_version(cpu);
 
        mmgrab(&init_mm);