diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
| commit | 927d2c21f2e82b93c791799c8da932a9bdffb436 (patch) | |
| tree | aec52fd2d3903751d696e809628d155c825ac730 /arch/sh/include/asm/tlb.h | |
| parent | cf31b7dd51b542f9a9b2d0de416b5524dfdb1cf2 (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
| download | linux-927d2c21f2e82b93c791799c8da932a9bdffb436.tar.bz2 | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include/asm/tlb.h')
| -rw-r--r-- | arch/sh/include/asm/tlb.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h index 46e0d635e36f..51a8bc967e75 100644 --- a/arch/sh/include/asm/tlb.h +++ b/arch/sh/include/asm/tlb.h @@ -36,7 +36,8 @@ static inline void init_tlb_gather(struct mmu_gather *tlb) } static inline void -tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end) +arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, + unsigned long start, unsigned long end) { tlb->mm = mm; tlb->start = start; @@ -47,9 +48,10 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start } static inline void -tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) +arch_tlb_finish_mmu(struct mmu_gather *tlb, + unsigned long start, unsigned long end, bool force) { - if (tlb->fullmm) + if (tlb->fullmm || force) flush_tlb_mm(tlb->mm); /* keep the page table cache within bounds */ |