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

Commit 329b10bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix off-by-1 error in TSB grow check.
parents fdccffc6 7bebd83d

arch/sparc64/mm/fault.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -413,12 +413,12 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) 
#ifdef CONFIG_HUGETLB_PAGE

#ifdef CONFIG_HUGETLB_PAGE

	mm_rss -= (mm->context.huge_pte_count * (HPAGE_SIZE / PAGE_SIZE));

	mm_rss -= (mm->context.huge_pte_count * (HPAGE_SIZE / PAGE_SIZE));

#endif

#endif

	if (unlikely(mm_rss >=

	if (unlikely(mm_rss >

		     mm->context.tsb_block[MM_TSB_BASE].tsb_rss_limit))

		     mm->context.tsb_block[MM_TSB_BASE].tsb_rss_limit))

		tsb_grow(mm, MM_TSB_BASE, mm_rss);

		tsb_grow(mm, MM_TSB_BASE, mm_rss);

#ifdef CONFIG_HUGETLB_PAGE

#ifdef CONFIG_HUGETLB_PAGE

	mm_rss = mm->context.huge_pte_count;

	mm_rss = mm->context.huge_pte_count;

	if (unlikely(mm_rss >=

	if (unlikely(mm_rss >

		     mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit))

		     mm->context.tsb_block[MM_TSB_HUGE].tsb_rss_limit))

		tsb_grow(mm, MM_TSB_HUGE, mm_rss);

		tsb_grow(mm, MM_TSB_HUGE, mm_rss);

#endif

#endif