From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933359AbbDIQMe (ORCPT ); Thu, 9 Apr 2015 12:12:34 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:47349 "EHLO e06smtp13.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932991AbbDIQM3 (ORCPT ); Thu, 9 Apr 2015 12:12:29 -0400 From: Gerald Schaefer To: Naoya Horiguchi , Andrew Morton , Hugh Dickins Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Michal Hocko , Andrea Arcangeli , Martin Schwidefsky , Gerald Schaefer , stable@vger.kernel.org.#.v3.12 Subject: [PATCH] mm/hugetlb: use pmd_page() in follow_huge_pmd() Date: Thu, 9 Apr 2015 18:11:35 +0200 Message-Id: <1428595895-24140-1-git-send-email-gerald.schaefer@de.ibm.com> X-Mailer: git-send-email 2.1.4 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15040916-0013-0000-0000-000003977E6A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 commit 61f77eda have pmd_page() defined, so this should not break anything on other architectures. Signed-off-by: Gerald Schaefer Cc: stable@vger.kernel.org # v3.12 --- mm/hugetlb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e8c92ae..271e443 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3865,8 +3865,7 @@ retry: 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) get_page(page); } else { -- 2.1.4