From: Gerald Schaefer <[email protected]> Subject: mm/hugetlb: use pmd_page() in follow_huge_pmd()
commit 61f77eda "mm/hugetlb: reduce arch dependent code around follow_huge_*" broke follow_huge_pmd() on s390, where pmd and pte layout differ and using pte_page() on a huge pmd will return wrong results. Using pmd_page() instead fixes this. All architectures that were touched by commit 61f77eda have pmd_page() defined, so this should not break anything on other architectures. Fixes: 61f77eda "mm/hugetlb: reduce arch dependent code around follow_huge_*" Signed-off-by: Gerald Schaefer <[email protected]> Acked-by: Naoya Horiguchi <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Michal Hocko <[email protected]>, Andrea Arcangeli <[email protected]> Cc: Martin Schwidefsky <[email protected]> Acked-by: David Rientjes <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- mm/hugetlb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN mm/hugetlb.c~mm-hugetlb-use-pmd_page-in-follow_huge_pmd mm/hugetlb.c --- a/mm/hugetlb.c~mm-hugetlb-use-pmd_page-in-follow_huge_pmd +++ a/mm/hugetlb.c @@ -3735,8 +3735,7 @@ retry: if (!pmd_huge(*pmd)) goto out; if (pmd_present(*pmd)) { - page = pte_page(*(pte_t *)pmd) + - ((address & ~PMD_MASK) >> PAGE_SHIFT); + page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT); if (flags & FOLL_GET) get_page(page); } else { _ -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
