diff --git a/[refs] b/[refs] index 002898821c10..7f28998c4460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3811dbf67162bd08412f1b0e02e554f353e93bdb +refs/heads/master: 421d99193537a6522aac2148286f08792167d5fd diff --git a/trunk/include/asm-generic/tlb.h b/trunk/include/asm-generic/tlb.h index f490e43a90b9..799307eea40f 100644 --- a/trunk/include/asm-generic/tlb.h +++ b/trunk/include/asm-generic/tlb.h @@ -14,6 +14,7 @@ #define _ASM_GENERIC__TLB_H #include +#include #include #include @@ -85,6 +86,9 @@ tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) static inline void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) { +#ifdef CONFIG_QUICKLIST + tlb->need_flush += &__get_cpu_var(quicklist)[0].nr_pages != 0; +#endif tlb_flush_mmu(tlb, start, end); /* keep the page table cache within bounds */