Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

futex: Fix additional regressions

Browse Source 
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: 4e0d846344 ("futex: Fix sparc32/m68k/nds32 build regression")
Fixes: 3f2bedabb6 ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20211203080823.2938839-1-arnd@kernel.org
This commit is contained in:
Arnd Bergmann 2021-12-03 09:07:56 +01:00 committed by Thomas Gleixner
parent 77993b595a
commit 0f09c27469
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/include/asm/futex.h
View File

@ -86,9 +86,9 @@
: "memory"); \ : "memory"); \
} else { \ } else { \
/* fallback for non-SMP */ \ /* fallback for non-SMP */ \
ret = arch_futex_atomic_op_inuser_local(op, oparg, oval,\ ret = futex_atomic_op_inuser_local(op, oparg, oval, uaddr); \
uaddr); \ } \
} }
static inline int static inline int
arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)

2
arch/xtensa/include/asm/futex.h
View File

@ -109,7 +109,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
return ret; return ret;
#else #else
return arch_futex_atomic_op_inuser_local(op, oparg, oval, uaddr); return futex_atomic_op_inuser_local(op, oparg, oval, uaddr);
#endif #endif
} }

2
include/asm-generic/futex.h
View File

@ -21,7 +21,7 @@
#endif #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 * argument and comparison of the previous
* futex value with another constant. * futex value with another constant.
* *