diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 06:42:20 +0200 |
| commit | 53971a86d2db89f32859dc26bd6594b5bc665d5b (patch) | |
| tree | 350ee9f3d53494036308cd123054dac3ba86ff91 /arch/s390/include/asm/tlb.h | |
| parent | usb: dwc2: fix sparse warning (diff) | |
| parent | Linux 3.15-rc3 (diff) | |
| download | linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.tar.xz linux-53971a86d2db89f32859dc26bd6594b5bc665d5b.zip | |
Merge 3.15-rc3 into usb-next
Diffstat (limited to 'arch/s390/include/asm/tlb.h')
| -rw-r--r-- | arch/s390/include/asm/tlb.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index c544b6f05d95..a25f09fbaf36 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -59,12 +59,23 @@ static inline void tlb_gather_mmu(struct mmu_gather *tlb, tlb->batch = NULL; } -static inline void tlb_flush_mmu(struct mmu_gather *tlb) +static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) { __tlb_flush_mm_lazy(tlb->mm); +} + +static inline void tlb_flush_mmu_free(struct mmu_gather *tlb) +{ tlb_table_flush(tlb); } + +static inline void tlb_flush_mmu(struct mmu_gather *tlb) +{ + tlb_flush_mmu_tlbonly(tlb); + tlb_flush_mmu_free(tlb); +} + static inline void tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) { |