diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-26 04:54:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-26 04:54:46 -0400 |
commit | 86ee79c3dbd48d7430fd81edc1da3516c9f6dabc (patch) | |
tree | d336e9b55772cc7db980620e2100b6e925f2bc64 /arch/sparc | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
sparc64: Flush TLB before releasing pages.
tlb_flush_mmu() needs to flush pending TLB entries before
processing the mmu_gather ->pages list.
Noticed by Benjamin Herrenschmidt.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/tlb_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h index ec81cdedef2c..ee38e731bfa6 100644 --- a/arch/sparc/include/asm/tlb_64.h +++ b/arch/sparc/include/asm/tlb_64.h | |||
@@ -57,6 +57,8 @@ static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned i | |||
57 | 57 | ||
58 | static inline void tlb_flush_mmu(struct mmu_gather *mp) | 58 | static inline void tlb_flush_mmu(struct mmu_gather *mp) |
59 | { | 59 | { |
60 | if (!mp->fullmm) | ||
61 | flush_tlb_pending(); | ||
60 | if (mp->need_flush) { | 62 | if (mp->need_flush) { |
61 | free_pages_and_swap_cache(mp->pages, mp->pages_nr); | 63 | free_pages_and_swap_cache(mp->pages, mp->pages_nr); |
62 | mp->pages_nr = 0; | 64 | mp->pages_nr = 0; |
@@ -78,8 +80,6 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un | |||
78 | 80 | ||
79 | if (mp->fullmm) | 81 | if (mp->fullmm) |
80 | mp->fullmm = 0; | 82 | mp->fullmm = 0; |
81 | else | ||
82 | flush_tlb_pending(); | ||
83 | 83 | ||
84 | /* keep the page table cache within bounds */ | 84 | /* keep the page table cache within bounds */ |
85 | check_pgt_cache(); | 85 | check_pgt_cache(); |