Commit bbc5332b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'locking-urgent-2024-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking doc fix from Ingo Molnar:
 "Fix typos in the kerneldoc of some of the atomic APIs"

* tag 'locking-urgent-2024-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/atomic: scripts: fix ${atomic}_sub_and_test() kerneldoc
parents dc772f82 f92a59f6
...@@ -2242,7 +2242,7 @@ raw_atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new) ...@@ -2242,7 +2242,7 @@ raw_atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new)
/** /**
* raw_atomic_sub_and_test() - atomic subtract and test if zero with full ordering * raw_atomic_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: int value to add * @i: int value to subtract
* @v: pointer to atomic_t * @v: pointer to atomic_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -4368,7 +4368,7 @@ raw_atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new) ...@@ -4368,7 +4368,7 @@ raw_atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new)
/** /**
* raw_atomic64_sub_and_test() - atomic subtract and test if zero with full ordering * raw_atomic64_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: s64 value to add * @i: s64 value to subtract
* @v: pointer to atomic64_t * @v: pointer to atomic64_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -4690,4 +4690,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v) ...@@ -4690,4 +4690,4 @@ raw_atomic64_dec_if_positive(atomic64_t *v)
} }
#endif /* _LINUX_ATOMIC_FALLBACK_H */ #endif /* _LINUX_ATOMIC_FALLBACK_H */
// 14850c0b0db20c62fdc78ccd1d42b98b88d76331 // b565db590afeeff0d7c9485ccbca5bb6e155749f
...@@ -1349,7 +1349,7 @@ atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new) ...@@ -1349,7 +1349,7 @@ atomic_try_cmpxchg_relaxed(atomic_t *v, int *old, int new)
/** /**
* atomic_sub_and_test() - atomic subtract and test if zero with full ordering * atomic_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: int value to add * @i: int value to subtract
* @v: pointer to atomic_t * @v: pointer to atomic_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -2927,7 +2927,7 @@ atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new) ...@@ -2927,7 +2927,7 @@ atomic64_try_cmpxchg_relaxed(atomic64_t *v, s64 *old, s64 new)
/** /**
* atomic64_sub_and_test() - atomic subtract and test if zero with full ordering * atomic64_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: s64 value to add * @i: s64 value to subtract
* @v: pointer to atomic64_t * @v: pointer to atomic64_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -4505,7 +4505,7 @@ atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new) ...@@ -4505,7 +4505,7 @@ atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new)
/** /**
* atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering * atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: long value to add * @i: long value to subtract
* @v: pointer to atomic_long_t * @v: pointer to atomic_long_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -5050,4 +5050,4 @@ atomic_long_dec_if_positive(atomic_long_t *v) ...@@ -5050,4 +5050,4 @@ atomic_long_dec_if_positive(atomic_long_t *v)
#endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ #endif /* _LINUX_ATOMIC_INSTRUMENTED_H */
// ce5b65e0f1f8a276268b667194581d24bed219d4 // 8829b337928e9508259079d32581775ececd415b
...@@ -1535,7 +1535,7 @@ raw_atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new) ...@@ -1535,7 +1535,7 @@ raw_atomic_long_try_cmpxchg_relaxed(atomic_long_t *v, long *old, long new)
/** /**
* raw_atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering * raw_atomic_long_sub_and_test() - atomic subtract and test if zero with full ordering
* @i: long value to add * @i: long value to subtract
* @v: pointer to atomic_long_t * @v: pointer to atomic_long_t
* *
* Atomically updates @v to (@v - @i) with full ordering. * Atomically updates @v to (@v - @i) with full ordering.
...@@ -1809,4 +1809,4 @@ raw_atomic_long_dec_if_positive(atomic_long_t *v) ...@@ -1809,4 +1809,4 @@ raw_atomic_long_dec_if_positive(atomic_long_t *v)
} }
#endif /* _LINUX_ATOMIC_LONG_H */ #endif /* _LINUX_ATOMIC_LONG_H */
// 1c4a26fc77f345342953770ebe3c4d08e7ce2f9a // eadf183c3600b8b92b91839dd3be6bcc560c752d
cat <<EOF cat <<EOF
/** /**
* ${class}${atomicname}() - atomic subtract and test if zero with ${desc_order} ordering * ${class}${atomicname}() - atomic subtract and test if zero with ${desc_order} ordering
* @i: ${int} value to add * @i: ${int} value to subtract
* @v: pointer to ${atomic}_t * @v: pointer to ${atomic}_t
* *
* Atomically updates @v to (@v - @i) with ${desc_order} ordering. * Atomically updates @v to (@v - @i) with ${desc_order} ordering.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment