linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Anders Roxell <anders.roxell@linaro.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	lkft-triage@lists.linaro.org,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'?
Date: Tue, 2 Feb 2021 14:46:24 +0100	[thread overview]
Message-ID: <CAAeHK+yUm_LAe54mBwFrjVwcSpLrxYHZFzDorUvFvRNsP7fjaA@mail.gmail.com> (raw)
In-Reply-To: <CADYN=9Ljjx6GRPk45jkY1N7dVDOFFjMB8yy5QRzVE-1tzEnUjw@mail.gmail.com>

On Tue, Feb 2, 2021 at 11:09 AM Anders Roxell <anders.roxell@linaro.org> wrote:
>
> Hi,
>
> I've seen this failure on tag next-20210202:
> arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync'
> undeclared here (not in a function); did you mean 'mte_enable_kernel'?
>
> I think it may be a merge conflict that didn't get resolved correctly?

Yes, that patch was supposed to go on top of another one (which
actually renames mte_enable_kernel to mte_enable_kernel_sync), but the
latter wasn't picked up into mm.

> The below change fixed the issue:
>
> diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c
> index 275b5d0f38b8..8f5bd1293496 100644
> --- a/arch/arm64/kernel/mte.c
> +++ b/arch/arm64/kernel/mte.c
> @@ -118,7 +118,7 @@ void mte_set_report_once(bool state)
>  {
>   WRITE_ONCE(report_fault_once, state);
>  }
> -EXPORT_SYMBOL(mte_enable_kernel_sync);
> +EXPORT_SYMBOL(mte_enable_kernel);
>  EXPORT_SYMBOL(mte_set_report_once);
>
>  bool mte_report_once(void)

The changed export also needs to be moved next to mte_enable_kernel().

Thanks!

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2021-02-02 13:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 10:09 arch/arm64/kernel/mte.c:121:15: error: 'mte_enable_kernel_sync' undeclared here (not in a function); did you mean 'mte_enable_kernel'? Anders Roxell
2021-02-02 13:46 ` Andrey Konovalov [this message]
2021-02-02 20:29   ` Stephen Rothwell

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=CAAeHK+yUm_LAe54mBwFrjVwcSpLrxYHZFzDorUvFvRNsP7fjaA@mail.gmail.com \
    --to=andreyknvl@google.com \
    --cc=akpm@linux-foundation.org \
    --cc=anders.roxell@linaro.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lkft-triage@lists.linaro.org \
    --cc=sfr@canb.auug.org.au \
    --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;
as well as URLs for NNTP newsgroup(s).