diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:01 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-10-29 13:26:01 +0800 |
commit | 25f89e269f5c5d06594098cc3b1d97554249f3f9 (patch) | |
tree | c7d301292dd77588cd6274bebb11530d60afb9cd /arch/s390 | |
parent | 59628a48e83c96ae3d6426391d93281e53c48462 (diff) | |
parent | c843445f19f4e6f05b32125d7556958f98033999 (diff) |
Merge tag 'v4.4.28' into linux-linaro-lsk-v4.4
This is the 4.4.28 stable release
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/tlbflush.h | 3 | ||||
-rw-r--r-- | arch/s390/mm/pgtable.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h index a2e6ef32e054..0a2031618f7f 100644 --- a/arch/s390/include/asm/tlbflush.h +++ b/arch/s390/include/asm/tlbflush.h @@ -81,7 +81,8 @@ static inline void __tlb_flush_full(struct mm_struct *mm) } /* - * Flush TLB entries for a specific ASCE on all CPUs. + * Flush TLB entries for a specific ASCE on all CPUs. Should never be used + * when more than one asce (e.g. gmap) ran on this mm. */ static inline void __tlb_flush_asce(struct mm_struct *mm, unsigned long asce) { diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 471a370a527b..8345ae1f117d 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(gmap_alloc); static void gmap_flush_tlb(struct gmap *gmap) { if (MACHINE_HAS_IDTE) - __tlb_flush_asce(gmap->mm, gmap->asce); + __tlb_flush_idte(gmap->asce); else __tlb_flush_global(); } @@ -205,7 +205,7 @@ void gmap_free(struct gmap *gmap) /* Flush tlb. */ if (MACHINE_HAS_IDTE) - __tlb_flush_asce(gmap->mm, gmap->asce); + __tlb_flush_idte(gmap->asce); else __tlb_flush_global(); |