From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrey Konovalov <andreyknvl@google.com>
Cc: Anders Roxell <anders.roxell@linaro.org>,
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>,
Andrew Morton <akpm@linux-foundation.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: Wed, 3 Feb 2021 07:29:38 +1100 [thread overview]
Message-ID: <20210203072938.62be70f5@canb.auug.org.au> (raw)
In-Reply-To: <CAAeHK+yUm_LAe54mBwFrjVwcSpLrxYHZFzDorUvFvRNsP7fjaA@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 2203 bytes --]
Hi all,
On Tue, 2 Feb 2021 14:46:24 +0100 Andrey Konovalov <andreyknvl@google.com> wrote:
>
> On Tue, Feb 2, 2021 at 11:09 AM Anders Roxell <anders.roxell@linaro.org> wrote:
> >
> > 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!
I have applied the following to linux-next today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Feb 2021 07:22:35 +1100
Subject: [PATCH] arm64-kasan-export-mte-symbols-for-kasan-tests-fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm64/kernel/mte.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c
index 275b5d0f38b8..8c7e32054172 100644
--- a/arch/arm64/kernel/mte.c
+++ b/arch/arm64/kernel/mte.c
@@ -113,12 +113,12 @@ void mte_enable_kernel(void)
sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC);
isb();
}
+EXPORT_SYMBOL(mte_enable_kernel);
void mte_set_report_once(bool state)
{
WRITE_ONCE(report_fault_once, state);
}
-EXPORT_SYMBOL(mte_enable_kernel_sync);
EXPORT_SYMBOL(mte_set_report_once);
bool mte_report_once(void)
--
2.30.0
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2021-02-02 20:31 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
2021-02-02 20:29 ` Stephen Rothwell [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=20210203072938.62be70f5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=anders.roxell@linaro.org \
--cc=andreyknvl@google.com \
--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=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).