From patchwork Fri May 22 08:57:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 475701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 36A36140E6C; Sat, 23 May 2015 01:59:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YvpMP-00027f-TS; Fri, 22 May 2015 15:59:45 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YvinT-0005hk-Qb for kernel-team@lists.ubuntu.com; Fri, 22 May 2015 08:59:15 +0000 Received: from 1.general.henrix.uk.vpn ([10.172.192.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1YvinT-0004EI-12; Fri, 22 May 2015 08:59:15 +0000 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com 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 X-Mailman-Approved-At: Fri, 22 May 2015 15:59:44 +0000 Cc: Andrea Arcangeli , Hugh Dickins , Michal Hocko , David Rientjes , Martin Schwidefsky , Naoya Horiguchi , Ben Hutchings , Andrew Morton , Gerald Schaefer X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 {