Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 413e3376 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 13220a94 86ee79c3

arch/sparc/include/asm/tlb_64.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)

static inline void tlb_flush_mmu(struct mmu_gather *mp)

{

{

	if (!mp->fullmm)

		flush_tlb_pending();

	if (mp->need_flush) {

	if (mp->need_flush) {

		free_pages_and_swap_cache(mp->pages, mp->pages_nr);

		free_pages_and_swap_cache(mp->pages, mp->pages_nr);

		mp->pages_nr = 0;

		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)

	if (mp->fullmm)

		mp->fullmm = 0;

		mp->fullmm = 0;

	else

		flush_tlb_pending();





	/* keep the page table cache within bounds */

	/* keep the page table cache within bounds */

	check_pgt_cache();

	check_pgt_cache();