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 /include/asm-generic | |
| parent | cf31b7dd51b542f9a9b2d0de416b5524dfdb1cf2 (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
| download | lwn-927d2c21f2e82b93c791799c8da932a9bdffb436.tar.gz lwn-927d2c21f2e82b93c791799c8da932a9bdffb436.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/tlb.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 8afa4335e5b2..faddde44de8c 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -112,10 +112,11 @@ struct mmu_gather { #define HAVE_GENERIC_MMU_GATHER -void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end); +void arch_tlb_gather_mmu(struct mmu_gather *tlb, + struct mm_struct *mm, unsigned long start, unsigned long end); void tlb_flush_mmu(struct mmu_gather *tlb); -void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, - unsigned long end); +void arch_tlb_finish_mmu(struct mmu_gather *tlb, + unsigned long start, unsigned long end, bool force); extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_size); |