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
Date: Fri, 26 Feb 2016 13:34:31 +0300 [thread overview]
Message-ID: <20160226103431.GB22450@node.shutemov.name> (raw)
In-Reply-To: <1456414385-13775-1-git-send-email-sudeep.holla@arm.com>
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
prev parent reply other threads:[~2016-02-26 10:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 15:33 Sudeep Holla
2016-02-26 10:34 ` Kirill A. Shutemov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160226103431.GB22450@node.shutemov.name \
--to=kirill@shutemov.name \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=steve.capper@linaro.org \
--cc=sudeep.holla@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®