[PATCH] futex: Fix sparc32/m68k/nds32 build regression

Arnd Bergmann
2021-11-26T10:01:01Z

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