From patchwork Thu Feb 25 15:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 62893 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp223948lbc; Thu, 25 Feb 2016 07:33:32 -0800 (PST) X-Received: by 10.66.62.169 with SMTP id z9mr6891666par.139.1456414412502; Thu, 25 Feb 2016 07:33:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e18si13187013pfj.30.2016.02.25.07.33.32; Thu, 25 Feb 2016 07:33:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760810AbcBYPda (ORCPT + 30 others); Thu, 25 Feb 2016 10:33:30 -0500 Received: from foss.arm.com ([217.140.101.70]:52510 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760249AbcBYPd3 (ORCPT ); Thu, 25 Feb 2016 10:33:29 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CFA0049; Thu, 25 Feb 2016 07:32:35 -0800 (PST) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AD8093F213; Thu, 25 Feb 2016 07:33:27 -0800 (PST) From: Sudeep Holla To: "Kirill A. Shutemov" , Andrew Morton Cc: Sudeep Holla , Catalin Marinas , Will Deacon , Steve Capper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] mm: fix build for arm64 hugetlbpage Date: Thu, 25 Feb 2016 15:33:05 +0000 Message-Id: <1456414385-13775-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit ("mm: cleanup *pte_alloc* interfaces") redefined pte_alloc_map() using pte_alloc() and fixed all the callsites. However arm64 callsite seem to have got missed. This patch fixes the same and thereby fixing the following build error. arch/arm64/mm/hugetlbpage.c: In function 'huge_pte_alloc': arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3 pte = pte_alloc_map(mm, NULL, pmd, addr); ^ arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function) pte = pte_alloc_map(mm, NULL, pmd, addr); ^ Signed-off-by: Sudeep Holla --- arch/arm64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Hi, Since it's from -mm tree, I have not put the commit id causing the breakage. Also since I don't have the original patch in my inbox, I am posting this separately. It would be good to squash this into original commit. Regards, Sudeep -- 1.9.1 diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 82d607c3614e..bb6b4c7bfab3 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -124,7 +124,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, * will be no pte_unmap() to correspond with this * pte_alloc_map(). */ - pte = pte_alloc_map(mm, NULL, pmd, addr); + pte = pte_alloc_map(mm, pmd, addr); } else if (sz == PMD_SIZE) { if (IS_ENABLED(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) && pud_none(*pud))