futex: Fix sparc32/m68k/nds32 build regression
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Nov 2021 09:58:40 +0000 (10:58 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 26 Nov 2021 20:50:36 +0000 (21:50 +0100)
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@canb.auug.org.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20211126095852.455492-1-arnd@kernel.org
include/asm-generic/futex.h

index 30e7fa63b5dfe921212e0ab89eafc90a77a2fe4f..66d6843bfd0247e0b3464009ad08f56a46c4d959 100644 (file)
@@ -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