Commit 171c4006 authored Jan 09, 2013 by Gerald Schaefer Committed by Martin Schwidefsky Jan 12, 2013

s390/mm: fix pmd_pfn() for thp



The pfn calculation in pmd_pfn() is broken for thp, because it uses
HPAGE_SHIFT instead of the normal PAGE_SHIFT. This is fixed by removing
the distinction between thp and normal pmds in that function, and always
using PAGE_SHIFT.

Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent b719f430

arch/s390/include/asm/pgtable.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -1387,9 +1387,6 @@ static inline int has_transparent_hugepage(void)

		static inline unsigned long pmd_pfn(pmd_t pmd)
		{
		if (pmd_trans_huge(pmd))
		return pmd_val(pmd) >> HPAGE_SHIFT;
		else
		return pmd_val(pmd) >> PAGE_SHIFT;
		}
		#endif /* CONFIG_TRANSPARENT_HUGEPAGE */