From 29ffd7c120cc85d5e6ffaae68fbea596dd02de01 Mon Sep 17 00:00:00 2001 From: Sanjay Lal Date: Wed, 21 Nov 2012 18:34:11 -0800 Subject: [PATCH] --- yaml --- r: 375181 b: refs/heads/master c: f9afbd45b0d04e4e1f9bff0b9309f61bfd28491c h: refs/heads/master i: 375179: e59741de6c1088aa9a8e1cd85e17cbde43929088 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/mmu_context.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 288f17bbbb29..574da6eb741d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2e3656d23b7e2465da22966feef6170e9b28b2b +refs/heads/master: f9afbd45b0d04e4e1f9bff0b9309f61bfd28491c diff --git a/trunk/arch/mips/include/asm/mmu_context.h b/trunk/arch/mips/include/asm/mmu_context.h index e81d719efcd1..c42562d801c5 100644 --- a/trunk/arch/mips/include/asm/mmu_context.h +++ b/trunk/arch/mips/include/asm/mmu_context.h @@ -106,15 +106,21 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) static inline void get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) { + extern void kvm_local_flush_tlb_all(void); unsigned long asid = asid_cache(cpu); if (! ((asid += ASID_INC) & ASID_MASK) ) { if (cpu_has_vtag_icache) flush_icache_all(); +#ifdef CONFIG_VIRTUALIZATION + kvm_local_flush_tlb_all(); /* start new asid cycle */ +#else local_flush_tlb_all(); /* start new asid cycle */ +#endif if (!asid) /* fix version if needed */ asid = ASID_FIRST_VERSION; } + cpu_context(cpu, mm) = asid_cache(cpu) = asid; }