Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161115AbbEVJb7 (ORCPT ); Fri, 22 May 2015 05:31:59 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:34993 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757071AbbEVI7X (ORCPT ); Fri, 22 May 2015 04:59:23 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Gerald Schaefer , Naoya Horiguchi , Hugh Dickins , Michal Hocko , Andrea Arcangeli , Martin Schwidefsky , David Rientjes , Andrew Morton , Ben Hutchings , Luis Henriques Subject: [PATCH 3.16.y-ckt 039/129] Revert "mm/hugetlb: use pmd_page() in follow_huge_pmd()" Date: Fri, 22 May 2015 09:57:04 +0100 Message-Id: <1432285114-9254-40-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> References: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1581 Lines: 45 3.16.7-ckt12 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Henriques 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 Cc: Naoya Horiguchi Cc: Hugh Dickins Cc: Michal Hocko Cc: Andrea Arcangeli Cc: Martin Schwidefsky Cc: David Rientjes Cc: Andrew Morton Cc: Ben Hutchings Signed-off-by: Luis Henriques --- 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 { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/