The following commit has been merged into the locking/core branch of tip:
Commit-ID: 4e0d84634445ed550498d613a49ea8f6cfa5e66c
Gitweb: https://git.kernel.org/tip/4e0d84634445ed550498d613a49ea8f6cfa5e66c
Author: Arnd Bergmann <arnd@xxxxxxxx>
AuthorDate: Fri, 26 Nov 2021 10:58:40 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Fri, 26 Nov 2021 21:50:36 +01:00
futex: Fix sparc32/m68k/nds32 build regression
The recent futex cleanup series, 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.
Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20211126095852.455492-1-arnd@xxxxxxxxxx
---
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 30e7fa6..66d6843 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
|