Commit 0f09c274 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Thomas Gleixner
Browse files

futex: Fix additional regressions 



Naresh reported another architecture that was broken by the same typo that
was already fixed for three architectures: mips also refers to the
futex_atomic_op_inuser_local() function by the wrong name and runs into a
missing closing '}' as well.

Going through the source tree the same typo was found in the documentation
as well as in the xtensa code, both of which ended up escaping the
regression testing so far. In the case of xtensa, it appears that the
broken code path is only used when building for platforms that are not
supported by the default gcc configuration, so they are impossible to test
for with default setups.

After going through these more carefully and fixing up the typos, all
architectures have been build-tested again to ensure that this is now
complete.

Fixes: 4e0d8463 ("futex: Fix sparc32/m68k/nds32 build regression")
Fixes: 3f2bedab ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Reported-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20211203080823.2938839-1-arnd@kernel.org
parent 77993b59

arch/mips/include/asm/futex.h

+3 −3
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ 
		: "memory");						\

	} else {							\

		/* fallback for non-SMP */				\

		ret = arch_futex_atomic_op_inuser_local(op, oparg, oval,\

							uaddr);	\

		ret = futex_atomic_op_inuser_local(op, oparg, oval, uaddr);	\

	}								\

}



static inline int

arch/xtensa/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, 


	return ret;

#else

	return arch_futex_atomic_op_inuser_local(op, oparg, oval, uaddr);

	return futex_atomic_op_inuser_local(op, oparg, oval, uaddr);

#endif

}

include/asm-generic/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#endif



/**

 * arch_futex_atomic_op_inuser_local() - Atomic arithmetic operation with constant

 * futex_atomic_op_inuser_local() - Atomic arithmetic operation with constant

 *			  argument and comparison of the previous

 *			  futex value with another constant.

 *