The following commit has been merged into the locking/core branch of tip:
Commit-ID: 0f09c274698590d508c43f924d9dffc7130b782d
Gitweb: https://git.kernel.org/tip/0f09c274698590d508c43f924d9dffc7130b782d
Author: Arnd Bergmann <arnd@xxxxxxxx>
AuthorDate: Fri, 03 Dec 2021 09:07:56 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Sat, 11 Dec 2021 23:31:51 +01:00
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: 4e0d84634445 ("futex: Fix sparc32/m68k/nds32 build regression")
Fixes: 3f2bedabb62c ("futex: Ensure futex_atomic_cmpxchg_inatomic() is present")
Reported-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx>
Reported-by: Naresh Kamboju <naresh.kamboju@xxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20211203080823.2938839-1-arnd@xxxxxxxxxx
---
arch/mips/include/asm/futex.h | 6 +++---
arch/xtensa/include/asm/futex.h | 2 +-
include/asm-generic/futex.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/futex.h b/arch/mips/include/asm/futex.h
index 9287110..8612a7e 100644
--- a/arch/mips/include/asm/futex.h
+++ b/arch/mips/include/asm/futex.h
@@ -86,9 +86,9 @@
: "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_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
index fe8f315..a6f7d7a 100644
--- a/arch/xtensa/include/asm/futex.h
+++ b/arch/xtensa/include/asm/futex.h
@@ -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
}
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 66d6843..2a19215 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -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.
*
|