scripts/atomic: fix kerneldoc spelling in try_cmpxchg
Subsystems (2)
PATCH 1/1 scripts/atomic: fix kerneldoc spelling in try_cmpxchg
Fix a typo in the kerneldoc comment template.
This changes 'occured' to 'occurred' in generated documentation.
--- scripts/atomic/kerneldoc/try_cmpxchg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/atomic/kerneldoc/try_cmpxchg +1 -1
@@ -11,6 +11,6 @@ cat <<EOF * * ${desc_noinstr} * - * Return: @true if the exchange occured, @false otherwise. + * Return: @true if the exchange occurred, @false otherwise. */ EOF
Signature · 1 line
2.43.0
Peter Zijlstra
maintainerQuoted 14 lines · oldzhu
Fix a typo in the kerneldoc comment template.
This changes 'occured' to 'occurred' in generated documentation.
Signed-off-by oldzhu <[email protected]>--- scripts/atomic/kerneldoc/try_cmpxchg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/atomic/kerneldoc/try_cmpxchg +0
-0
scripts/atomic/kerneldoc/try_cmpxchg cat <<EOF · line 16
Quoted 7 lines
scripts/atomic/kerneldoc/try_cmpxchg +1
-1@@ -11,6 +11,6 @@ cat <<EOF * * ${desc_noinstr} * - * Return: @true if the exchange occured, @false otherwise. + * Return: @true if the exchange occurred, @false otherwise. */ EOF
I've picked this up, had to modify if to include the results of running ./scripts/atomics/gen-atomics.sh. It now looks like:
---
Subject: scripts/atomic: Fix kerneldoc spelling in try_cmpxchg()
From: oldzhu <[email protected]>
Date: Tue, 6 Jan 2026 12:01:58 +0800
From: oldzhu <[email protected]>
Fix a typo in the kerneldoc comment template.
This changes 'occured' to 'occurred' in generated documentation.
--- include/linux/atomic/atomic-arch-fallback.h | 20 ++++++++++---------- include/linux/atomic/atomic-instrumented.h | 28 ++++++++++++++-------------- include/linux/atomic/atomic-long.h | 12 ++++++------ rust/helpers/atomic.c | 4 ++-- scripts/atomic/kerneldoc/try_cmpxchg | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-)
include/linux/atomic/atomic-arch-fallback.h +10 -10
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -// Generated by scripts/atomic/gen-atomic-fallback.sh +// Generated by ./scripts/atomic/gen-atomic-fallback.sh // DO NOT MODIFY THIS FILE DIRECTLY #ifndef _LINUX_ATOMIC_FALLBACK_H
@@ -2121,7 +2121,7 @@ raw_atomic_cmpxchg_relaxed(atomic_t *v, int old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg (atomic_t *v,int *old,int new)
@@ -2155,7 +2155,7 @@ raw_atomic_try_cmpxchg(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_acquire (atomic_t *v,int *old,int new)
@@ -2189,7 +2189,7 @@ raw_atomic_try_cmpxchg_acquire(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_release (atomic_t *v,int *old,int new)
@@ -2222,7 +2222,7 @@ raw_atomic_try_cmpxchg_release(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_relaxed (atomic_t *v,int *old,int new)
@@ -4247,7 +4247,7 @@ raw_atomic64_cmpxchg_relaxed(atomic64_t *v, s64 old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg (atomic64_t *v,s64 *old,s64 new)
@@ -4281,7 +4281,7 @@ raw_atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_acquire (atomic64_t *v,s64 *old,s64 new)
@@ -4315,7 +4315,7 @@ raw_atomic64_try_cmpxchg_acquire(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_release (atomic64_t *v,s64 *old,s64 new)
@@ -4348,7 +4348,7 @@ raw_atomic64_try_cmpxchg_release(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_relaxed (atomic64_t *v,s64 *old,s64 new)
@@ -4690,4 +4690,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v) }#endif /* _LINUX_ATOMIC_FALLBACK_H */ -// b565db590afeeff0d7c9485ccbca5bb6e155749f +// f7fd0d17b879de379d5e8ff253a52e7c0f374e15
include/linux/atomic/atomic-instrumented.h +14 -14
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -// Generated by scripts/atomic/gen-atomic-instrumented.sh +// Generated by ./scripts/atomic/gen-atomic-instrumented.sh // DO NOT MODIFY THIS FILE DIRECTLY /*
@@ -1269,7 +1269,7 @@ atomic_cmpxchg_relaxed(atomic_t *v, int old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg (atomic_t *v,int *old,int new)
@@ -1292,7 +1292,7 @@ atomic_try_cmpxchg(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_acquire (atomic_t *v,int *old,int new)
@@ -1314,7 +1314,7 @@ atomic_try_cmpxchg_acquire(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_release (atomic_t *v,int *old,int new)
@@ -1337,7 +1337,7 @@ atomic_try_cmpxchg_release(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_relaxed (atomic_t *v,int *old,int new)
@@ -2847,7 +2847,7 @@ atomic64_cmpxchg_relaxed(atomic64_t *v, s64 old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg (atomic64_t *v,s64 *old,s64 new)
@@ -2870,7 +2870,7 @@ atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_acquire (atomic64_t *v,s64 *old,s64 new)
@@ -2892,7 +2892,7 @@ atomic64_try_cmpxchg_acquire(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_release (atomic64_t *v,s64 *old,s64 new)
@@ -2915,7 +2915,7 @@ atomic64_try_cmpxchg_release(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_relaxed (atomic64_t *v,s64 *old,s64 new)
@@ -4425,7 +4425,7 @@ atomic_long_cmpxchg_relaxed(atomic_long_t *v, long old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg (atomic_long_t *v,long *old,long new)
@@ -4448,7 +4448,7 @@ atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_acquire (atomic_long_t *v,long *old,long new)
@@ -4470,7 +4470,7 @@ atomic_long_try_cmpxchg_acquire(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_release (atomic_long_t *v,long *old,long new)
@@ -4493,7 +4493,7 @@ atomic_long_try_cmpxchg_release(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_relaxed (atomic_long_t *v,long *old,long new)
@@ -5050,4 +5050,4 @@ atomic_long_dec_if_positive(atomic_long_t *v)#endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ -// f618ac667f868941a84ce0ab2242f1786e049ed4 +// 4057df3ae18f0cc2decee022a30210e83a356a5a
include/linux/atomic/atomic-long.h +6 -6
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -// Generated by scripts/atomic/gen-atomic-long.sh +// Generated by ./scripts/atomic/gen-atomic-long.sh // DO NOT MODIFY THIS FILE DIRECTLY #ifndef _LINUX_ATOMIC_LONG_H
@@ -1449,7 +1449,7 @@ raw_atomic_long_cmpxchg_relaxed(atomic_long_t *v, long old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg (atomic_long_t *v,long *old,long new)
@@ -1473,7 +1473,7 @@ raw_atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_acquire (atomic_long_t *v,long *old,long new)
@@ -1497,7 +1497,7 @@ raw_atomic_long_try_cmpxchg_acquire(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_release (atomic_long_t *v,long *old,long new)
@@ -1521,7 +1521,7 @@ raw_atomic_long_try_cmpxchg_release(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_relaxed (atomic_long_t *v,long *old,long new)
@@ -1809,4 +1809,4 @@ raw_atomic_long_dec_if_positive(atomic_long_t *v) }#endif /* _LINUX_ATOMIC_LONG_H */ -// eadf183c3600b8b92b91839dd3be6bcc560c752d +// 7b852ddacc05b38967fe7a1e0ca6ce825f682475
rust/helpers/atomic.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 -// Generated by scripts/atomic/gen-rust-atomic-helpers.sh +// Generated by ./scripts/atomic/gen-rust-atomic-helpers.sh // DO NOT MODIFY THIS FILE DIRECTLY /*
@@ -1037,4 +1037,4 @@ rust_helper_atomic64_dec_if_positive(atomic64_t *v) }#endif /* _RUST_ATOMIC_API_H */ -// 615a0e0c98b5973a47fe4fa65e92935051ca00ed +// 717bf478af256c3d8a9ec03fecc68e2101f3d3e3
scripts/atomic/kerneldoc/try_cmpxchg +1 -1
@@ -11,6 +11,6 @@ cat <<EOF * * ${desc_noinstr} * - * Return: @true if the exchange occured, @false otherwise. + * Return: @true if the exchange occurred, @false otherwise. */ EOF
Peter Zijlstra
maintainerinclude/linux/atomic/atomic-arch-fallback.h line 3
Quoted 2 lines · Peter Zijlstra
include/linux/atomic/atomic-arch-fallback.h +1
-1-// Generated by scripts/atomic/gen-atomic-fallback.sh +// Generated by ./scripts/atomic/gen-atomic-fallback.sh
Noted that 'spurious' change, fixed that.
Thanks, noted about generated files; I’ll include them next time.
[tip: locking/core] scripts/atomic: Fix kerneldoc spelling in try_cmpxchg()
In reply to oldzhuThe following commit has been merged into the locking/core branch of tip:
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 0e2036a06dcf61dbd100168830287d6c42cd61e1 Gitweb: https://git.kernel.org/tip/0e2036a06dcf61dbd100168830287d6c42cd61e1 Author: oldzhu <[email protected]> AuthorDate: Tue, 06 Jan 2026 12:01:58 +08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 06 Jan 2026 16:34:28 +01:00
scripts/atomic: Fix kerneldoc spelling in try_cmpxchg()
Fix a typo in the kerneldoc comment template.
This changes 'occured' to 'occurred' in generated documentation.
--- include/linux/atomic/atomic-arch-fallback.h | 18 +++++++------- include/linux/atomic/atomic-instrumented.h | 26 ++++++++++---------- include/linux/atomic/atomic-long.h | 10 ++++---- scripts/atomic/kerneldoc/try_cmpxchg | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-)
include/linux/atomic/atomic-arch-fallback.h +9 -9
@@ -2121,7 +2121,7 @@ raw_atomic_cmpxchg_relaxed(atomic_t *v, int old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg (atomic_t *v,int *old,int new)
@@ -2155,7 +2155,7 @@ raw_atomic_try_cmpxchg(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_acquire (atomic_t *v,int *old,int new)
@@ -2189,7 +2189,7 @@ raw_atomic_try_cmpxchg_acquire(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_release (atomic_t *v,int *old,int new)
@@ -2222,7 +2222,7 @@ raw_atomic_try_cmpxchg_release(atomic_t *v, int *old, int new)* * Safe to use in noinstr code; prefer atomic_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_try_cmpxchg_relaxed (atomic_t *v,int *old,int new)
@@ -4247,7 +4247,7 @@ raw_atomic64_cmpxchg_relaxed(atomic64_t *v, s64 old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg (atomic64_t *v,s64 *old,s64 new)
@@ -4281,7 +4281,7 @@ raw_atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_acquire (atomic64_t *v,s64 *old,s64 new)
@@ -4315,7 +4315,7 @@ raw_atomic64_try_cmpxchg_acquire(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_release (atomic64_t *v,s64 *old,s64 new)
@@ -4348,7 +4348,7 @@ raw_atomic64_try_cmpxchg_release(atomic64_t *v, s64 *old, s64 new)* * Safe to use in noinstr code; prefer atomic64_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic64_try_cmpxchg_relaxed (atomic64_t *v,s64 *old,s64 new)
@@ -4690,4 +4690,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v) }#endif /* _LINUX_ATOMIC_FALLBACK_H */ -// b565db590afeeff0d7c9485ccbca5bb6e155749f +// 206314f82b8b73a5c3aa69cf7f35ac9e7b5d6b58
include/linux/atomic/atomic-instrumented.h +13 -13
@@ -1269,7 +1269,7 @@ atomic_cmpxchg_relaxed(atomic_t *v, int old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg (atomic_t *v,int *old,int new)
@@ -1292,7 +1292,7 @@ atomic_try_cmpxchg(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_acquire (atomic_t *v,int *old,int new)
@@ -1314,7 +1314,7 @@ atomic_try_cmpxchg_acquire(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_release (atomic_t *v,int *old,int new)
@@ -1337,7 +1337,7 @@ atomic_try_cmpxchg_release(atomic_t *v, int *old, int new)* * Unsafe to use in noinstr code; use raw_atomic_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_try_cmpxchg_relaxed (atomic_t *v,int *old,int new)
@@ -2847,7 +2847,7 @@ atomic64_cmpxchg_relaxed(atomic64_t *v, s64 old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg (atomic64_t *v,s64 *old,s64 new)
@@ -2870,7 +2870,7 @@ atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_acquire (atomic64_t *v,s64 *old,s64 new)
@@ -2892,7 +2892,7 @@ atomic64_try_cmpxchg_acquire(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_release (atomic64_t *v,s64 *old,s64 new)
@@ -2915,7 +2915,7 @@ atomic64_try_cmpxchg_release(atomic64_t *v, s64 *old, s64 new)* * Unsafe to use in noinstr code; use raw_atomic64_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic64_try_cmpxchg_relaxed (atomic64_t *v,s64 *old,s64 new)
@@ -4425,7 +4425,7 @@ atomic_long_cmpxchg_relaxed(atomic_long_t *v, long old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg (atomic_long_t *v,long *old,long new)
@@ -4448,7 +4448,7 @@ atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_acquire() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_acquire (atomic_long_t *v,long *old,long new)
@@ -4470,7 +4470,7 @@ atomic_long_try_cmpxchg_acquire(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_release() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_release (atomic_long_t *v,long *old,long new)
@@ -4493,7 +4493,7 @@ atomic_long_try_cmpxchg_release(atomic_long_t *v, long *old, long new)* * Unsafe to use in noinstr code; use raw_atomic_long_try_cmpxchg_relaxed() there. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolatomic_long_try_cmpxchg_relaxed (atomic_long_t *v,long *old,long new)
@@ -5050,4 +5050,4 @@ atomic_long_dec_if_positive(atomic_long_t *v)#endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ -// f618ac667f868941a84ce0ab2242f1786e049ed4 +// 9dd948d3012b22c4e75933a5172983f912e46439
include/linux/atomic/atomic-long.h +5 -5
@@ -1449,7 +1449,7 @@ raw_atomic_long_cmpxchg_relaxed(atomic_long_t *v, long old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg (atomic_long_t *v,long *old,long new)
@@ -1473,7 +1473,7 @@ raw_atomic_long_try_cmpxchg(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_acquire() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_acquire (atomic_long_t *v,long *old,long new)
@@ -1497,7 +1497,7 @@ raw_atomic_long_try_cmpxchg_acquire(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_release() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_release (atomic_long_t *v,long *old,long new)
@@ -1521,7 +1521,7 @@ raw_atomic_long_try_cmpxchg_release(atomic_long_t *v, long *old, long new)* * Safe to use in noinstr code; prefer atomic_long_try_cmpxchg_relaxed() elsewhere. * -* Return: @true if the exchange occured, @false otherwise. +* Return: @true if the exchange occurred, @false otherwise. */ static __always_inline boolraw_atomic_long_try_cmpxchg_relaxed (atomic_long_t *v,long *old,long new)
@@ -1809,4 +1809,4 @@ raw_atomic_long_dec_if_positive(atomic_long_t *v) }#endif /* _LINUX_ATOMIC_LONG_H */ -// eadf183c3600b8b92b91839dd3be6bcc560c752d +// 4b882bf19018602c10816c52f8b4ae280adc887b
scripts/atomic/kerneldoc/try_cmpxchg +1 -1
@@ -11,6 +11,6 @@ cat <<EOF * * ${desc_noinstr} * - * Return: @true if the exchange occured, @false otherwise. + * Return: @true if the exchange occurred, @false otherwise. */ EOF