[3.16.y-ckt stable] Patch "Revert "mm/hugetlb: use pmd_page() in follow_huge_pmd()"" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

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

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt12.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 45edcd45af325f39d985f3d0ecee1c71376d8c34 Mon Sep 17 00:00:00 2001
From: Luis Henriques <luis.henriques at canonical.com>
Date: Mon, 18 May 2015 11:01:04 +0100
Subject: 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 at de.ibm.com>
Cc: Naoya Horiguchi <n-horiguchi at ah.jp.nec.com>
Cc: Hugh Dickins <hughd at google.com>
Cc: Michal Hocko <mhocko at suse.cz>
Cc: Andrea Arcangeli <aarcange at redhat.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 mm/hugetlb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1e080a06e6ba..5f217e906ff9 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 {