From: Arnd Bergmann <arnd@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Ingo Molnar" <mingo@redhat.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Darren Hart" <dvhart@infradead.org>,
"Davidlohr Bueso" <dave@stgolabs.net>,
"André Almeida" <andrealmeid@collabora.com>,
"Nick Hu" <nickhu@andestech.com>,
"Greentime Hu" <green.hu@gmail.com>,
"Vincent Chen" <deanbo422@gmail.com>,
"Rich Felker" <dalias@libc.org>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Subject: [PATCH] futex: Fix sparc32/m68k/nds32 build regression
Date: Fri, 26 Nov 2021 10:58:40 +0100 [thread overview]
Message-ID: <20211126095852.455492-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
In one of the revisions of my futex cleanup series, I botched
up a rename of some function names, breaking sparc32, m68k
and nds32:
include/asm-generic/futex.h:17:2: error: implicit declaration of function 'futex_atomic_cmpxchg_inatomic_local_generic'; did you mean 'futex_atomic_cmpxchg_inatomic_local'? [-Werror=implicit-function-declaration]
Fix the macros to point to the correct functions.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/asm-generic/futex.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 30e7fa63b5df..66d6843bfd02 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -14,9 +14,9 @@
*
*/
#define futex_atomic_cmpxchg_inatomic(uval, uaddr, oldval, newval) \
- futex_atomic_cmpxchg_inatomic_local_generic(uval, uaddr, oldval, newval)
+ futex_atomic_cmpxchg_inatomic_local(uval, uaddr, oldval, newval)
#define arch_futex_atomic_op_inuser(op, oparg, oval, uaddr) \
- arch_futex_atomic_op_inuser_local_generic(op, oparg, oval, uaddr)
+ futex_atomic_op_inuser_local(op, oparg, oval, uaddr)
#endif /* CONFIG_SMP */
#endif
--
2.29.2
next reply other threads:[~2021-11-26 10:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 9:58 Arnd Bergmann [this message]
2021-11-26 20:55 ` [tip: locking/core] futex: Fix sparc32/m68k/nds32 build regression tip-bot2 for Arnd Bergmann
2021-12-10 10:39 ` [PATCH] " Ingo Molnar
2021-12-10 10:49 ` Arnd Bergmann
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=20211126095852.455492-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=andrealmeid@collabora.com \
--cc=arnd@arndb.de \
--cc=dalias@libc.org \
--cc=dave@stgolabs.net \
--cc=deanbo422@gmail.com \
--cc=dvhart@infradead.org \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nickhu@andestech.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).