From: Luis Henriques <luis.henriques@canonical.com>
Date: Mon, 18 May 2015 10:01:04 +0000 (+0100)
Subject: Revert "mm/hugetlb: use pmd_page() in follow_huge_pmd()"
X-Git-Tag: v3.16.35~2114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45edcd45af325f39d985f3d0ecee1c71376d8c34;p=thirdparty%2Fkernel%2Fstable.git

Revert "mm/hugetlb: use pmd_page() in follow_huge_pmd()"

This reverts commit 65342eab7baa43fb7852aafbe99e54daf2cd6420 which is
commit 97534127012f0e396eddea4691f4c9b170aed74b upstream.

This is being reverted because it fixes a regression that was introduced
in 4.0 and does not affect 3.16 kernel.

Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1e080a06e6ba1..5f217e906ff99 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3723,7 +3723,8 @@ retry:
 	if (!pmd_huge(*pmd))
 		goto out;
 	if (pmd_present(*pmd)) {
-		page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT);
+		page = pte_page(*(pte_t *)pmd) +
+			((address & ~PMD_MASK) >> PAGE_SHIFT);
 		if (flags & FOLL_GET)
 			get_page(page);
 	} else {