summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 23:56:53 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 23:56:53 +0100
commit413e3376485e6cf81f4cf6a4dbc0de0326535093 (patch)
tree915094c7d2bf3db60372d9578175afc8abd2f561 /arch/sparc
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 (diff)
parentsparc64: Flush TLB before releasing pages. (diff)
downloadlinux-413e3376485e6cf81f4cf6a4dbc0de0326535093.tar.xz
linux-413e3376485e6cf81f4cf6a4dbc0de0326535093.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Flush TLB before releasing pages.
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/tlb_64.h4
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
static inline void tlb_flush_mmu(struct mmu_gather *mp)
{
+ if (!mp->fullmm)
+ flush_tlb_pending();
if (mp->need_flush) {
free_pages_and_swap_cache(mp->pages, mp->pages_nr);
mp->pages_nr = 0;
@@ -78,8 +80,6 @@ static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, un
if (mp->fullmm)
mp->fullmm = 0;
- else
- flush_tlb_pending();
/* keep the page table cache within bounds */
check_pgt_cache();