Commit 97534127 authored by Gerald Schaefer's avatar Gerald Schaefer Committed by Linus Torvalds
Browse files

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 that commit 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: default avatarGerald Schaefer <>
Acked-by: default avatarNaoya Horiguchi <>
Cc: Hugh Dickins <>
Cc: Michal Hocko <>, Andrea Arcangeli <>
Cc: Martin Schwidefsky <>
Acked-by: default avatarDavid Rientjes <>
Cc: <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 31f7dc79
......@@ -3735,8 +3735,7 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address,
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)
} else {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment