diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /arch/s390/include/asm/tlb.h | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-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, | |||
| 59 | tlb->batch = NULL; | 59 | tlb->batch = NULL; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | static inline void tlb_flush_mmu(struct mmu_gather *tlb) | 62 | static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) |
| 63 | { | 63 | { |
| 64 | __tlb_flush_mm_lazy(tlb->mm); | 64 | __tlb_flush_mm_lazy(tlb->mm); |
| 65 | } | ||
| 66 | |||
| 67 | static inline void tlb_flush_mmu_free(struct mmu_gather *tlb) | ||
| 68 | { | ||
| 65 | tlb_table_flush(tlb); | 69 | tlb_table_flush(tlb); |
| 66 | } | 70 | } |
| 67 | 71 | ||
| 72 | |||
| 73 | static inline void tlb_flush_mmu(struct mmu_gather *tlb) | ||
| 74 | { | ||
| 75 | tlb_flush_mmu_tlbonly(tlb); | ||
| 76 | tlb_flush_mmu_free(tlb); | ||
| 77 | } | ||
| 78 | |||
| 68 | static inline void tlb_finish_mmu(struct mmu_gather *tlb, | 79 | static inline void tlb_finish_mmu(struct mmu_gather *tlb, |
| 69 | unsigned long start, unsigned long end) | 80 | unsigned long start, unsigned long end) |
| 70 | { | 81 | { |