From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754067AbcBZKfq (ORCPT <rfc822;w@1wt.eu>);
	Fri, 26 Feb 2016 05:35:46 -0500
Received: from mail-wm0-f52.google.com ([74.125.82.52]:34112 "EHLO
	mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932676AbcBZKef (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 26 Feb 2016 05:34:35 -0500
Date: Fri, 26 Feb 2016 13:34:31 +0300
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Sudeep Holla <sudeep.holla@arm.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will.deacon@arm.com>,
        Steve Capper <steve.capper@linaro.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] mm: fix build for arm64 hugetlbpage
Message-ID: <20160226103431.GB22450@node.shutemov.name>
References: <1456414385-13775-1-git-send-email-sudeep.holla@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1456414385-13775-1-git-send-email-sudeep.holla@arm.com>
User-Agent: Mutt/1.5.23.1 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Feb 25, 2016 at 03:33:05PM +0000, Sudeep Holla wrote:
> 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 <sudeep.holla@arm.com>

Sorry for that.

Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

> ---
>  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
> 
> 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))
> -- 
> 1.9.1
> 

-- 
 Kirill A. Shutemov