Skip to content

Commit 0f09c27

Browse files
arndbKAGA-KOKO
authored andcommitted
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: 4e0d846 ("futex: Fix sparc32/m68k/nds32 build regression") Fixes: 3f2beda ("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
1 parent 77993b5 commit 0f09c27

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/mips/include/asm/futex.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
: "memory"); \
8787
} else { \
8888
/* fallback for non-SMP */ \
89-
ret = arch_futex_atomic_op_inuser_local(op, oparg, oval,\
90-
uaddr); \
91-
}
89+
ret = futex_atomic_op_inuser_local(op, oparg, oval, uaddr); \
90+
} \
91+
}
9292

9393
static inline int
9494
arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)

arch/xtensa/include/asm/futex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
109109

110110
return ret;
111111
#else
112-
return arch_futex_atomic_op_inuser_local(op, oparg, oval, uaddr);
112+
return futex_atomic_op_inuser_local(op, oparg, oval, uaddr);
113113
#endif
114114
}
115115

include/asm-generic/futex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222

2323
/**
24-
* arch_futex_atomic_op_inuser_local() - Atomic arithmetic operation with constant
24+
* futex_atomic_op_inuser_local() - Atomic arithmetic operation with constant
2525
* argument and comparison of the previous
2626
* futex value with another constant.
2727
*

0 commit comments

Comments
 (0)