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

Commit ac65e282 authored by Nitin Gupta's avatar Nitin Gupta Committed by David S. Miller
Browse files

sparc64: Fix build error in flush_tsb_user_page 



Patch "sparc64: Add 64K page size support"
unconditionally used __flush_huge_tsb_one_entry()
which is available only when hugetlb support is
enabled.

Another issue was incorrect TSB flushing for 64K
pages in flush_tsb_user().

Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd429ce2

arch/sparc/mm/hugetlbpage.c

+3 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 


	addr &= ~(size - 1);

	orig = *ptep;

	orig_shift = pte_none(orig) ? PAGE_SIZE : huge_tte_to_shift(orig);

	orig_shift = pte_none(orig) ? PAGE_SHIFT : huge_tte_to_shift(orig);



	for (i = 0; i < nptes; i++)

		ptep[i] = __pte(pte_val(entry) + (i << shift));
@@ -335,7 +335,8 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
	else

		nptes = size >> PAGE_SHIFT;



	hugepage_shift = pte_none(entry) ? PAGE_SIZE : huge_tte_to_shift(entry);

	hugepage_shift = pte_none(entry) ? PAGE_SHIFT :

		huge_tte_to_shift(entry);



	if (pte_present(entry))

		mm->context.hugetlb_pte_count -= nptes;

arch/sparc/mm/tsb.c

+16 −4
Original line number Diff line number Diff line
@@ -120,12 +120,18 @@ void flush_tsb_user(struct tlb_batch *tb) 


	spin_lock_irqsave(&mm->context.lock, flags);



	if (tb->hugepage_shift == PAGE_SHIFT) {

	if (tb->hugepage_shift < HPAGE_SHIFT) {

		base = (unsigned long) mm->context.tsb_block[MM_TSB_BASE].tsb;

		nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries;

		if (tlb_type == cheetah_plus || tlb_type == hypervisor)

			base = __pa(base);

		if (tb->hugepage_shift == PAGE_SHIFT)

			__flush_tsb_one(tb, PAGE_SHIFT, base, nentries);

#if defined(CONFIG_HUGETLB_PAGE)

		else

			__flush_huge_tsb_one(tb, PAGE_SHIFT, base, nentries,

					     tb->hugepage_shift);

#endif

	}

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

	else if (mm->context.tsb_block[MM_TSB_HUGE].tsb) {
@@ -152,8 +158,14 @@ void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr, 
		nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries;

		if (tlb_type == cheetah_plus || tlb_type == hypervisor)

			base = __pa(base);

		__flush_huge_tsb_one_entry(base, vaddr, PAGE_SHIFT, nentries,

					   hugepage_shift);

		if (hugepage_shift == PAGE_SHIFT)

			__flush_tsb_one_entry(base, vaddr, PAGE_SHIFT,

					      nentries);

#if defined(CONFIG_HUGETLB_PAGE)

		else

			__flush_huge_tsb_one_entry(base, vaddr, PAGE_SHIFT,

						   nentries, hugepage_shift);

#endif

	}

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

	else if (mm->context.tsb_block[MM_TSB_HUGE].tsb) {