s390/mm: fix pmd_pfn() for thp

gerald-schaefer · Martin Schwidefsky · commit 171c4006fb1b · 2013-01-12T18:49:25.000+01:00
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 &lt;borntraeger@de.ibm.com&gt;
Signed-off-by: Gerald Schaefer &lt;gerald.schaefer@de.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
@@ -1387,10 +1387,7 @@ 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;
+	return pmd_val(pmd) >> PAGE_SHIFT;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 

Original file line number	Diff line number	Diff line change
`@@ -1387,10 +1387,7 @@ static inline int has_transparent_hugepage(void)`
`1387`	`1387`
`1388`	`1388`	`static inline unsigned long pmd_pfn(pmd_t pmd)`
`1389`	`1389`	`{`
`1390`		`- if (pmd_trans_huge(pmd))`
`1391`		`- return pmd_val(pmd) >> HPAGE_SHIFT;`
`1392`		`- else`
`1393`		`- return pmd_val(pmd) >> PAGE_SHIFT;`
	`1390`	`+ return pmd_val(pmd) >> PAGE_SHIFT;`
`1394`	`1391`	`}`
`1395`	`1392`	`#endif /* CONFIG_TRANSPARENT_HUGEPAGE */`
`1396`	`1393`