6.6-stable patches

added patches:
	locking-atomic-scripts-fix-atomic-_sub_and_test-kerneldoc.patch

diff --git a/queue-6.6/locking-atomic-scripts-fix-atomic-_sub_and_test-kerneldoc.patch b/queue-6.6/locking-atomic-scripts-fix-atomic-_sub_and_test-kerneldoc.patch
new file mode 100644 (file)
index 0000000..b1b206a
--- /dev/null
+++ b/queue-6.6/locking-atomic-scripts-fix-atomic-_sub_and_test-kerneldoc.patch
@@ -0,0 +1,120 @@
+From f92a59f6d12e31ead999fee9585471b95a8ae8a3 Mon Sep 17 00:00:00 2001
+From: Carlos Llamas <cmllamas@google.com>
+Date: Wed, 15 May 2024 13:37:10 +0000
+Subject: locking/atomic: scripts: fix ${atomic}_sub_and_test() kerneldoc
+
+From: Carlos Llamas <cmllamas@google.com>
+
+commit f92a59f6d12e31ead999fee9585471b95a8ae8a3 upstream.
+
+For ${atomic}_sub_and_test() the @i parameter is the value to subtract,
+not add. Fix the typo in the kerneldoc template and generate the headers
+with this update.
+
+Fixes: ad8110706f38 ("locking/atomic: scripts: generate kerneldoc comments")
+Suggested-by: Mark Rutland <mark.rutland@arm.com>
+Signed-off-by: Carlos Llamas <cmllamas@google.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Acked-by: Mark Rutland <mark.rutland@arm.com>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Cc: stable@vger.kernel.org
+Link: https://lkml.kernel.org/r/20240515133844.3502360-1-cmllamas@google.com
+[cmllamas: generate headers with gen-atomics.sh]
+Signed-off-by: Carlos Llamas <cmllamas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/atomic/atomic-arch-fallback.h |    6 +++---
+ include/linux/atomic/atomic-instrumented.h  |    8 ++++----
+ include/linux/atomic/atomic-long.h          |    4 ++--
+ scripts/atomic/kerneldoc/sub_and_test       |    2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+--- a/include/linux/atomic/atomic-arch-fallback.h
++++ b/include/linux/atomic/atomic-arch-fallback.h
+@@ -2221,7 +2221,7 @@ raw_atomic_try_cmpxchg_relaxed(atomic_t
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -4333,7 +4333,7 @@ raw_atomic64_try_cmpxchg_relaxed(atomic6
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -4649,4 +4649,4 @@ raw_atomic64_dec_if_positive(atomic64_t
+ }
+ 
+ #endif /* _LINUX_ATOMIC_FALLBACK_H */
+-// 2fdd6702823fa842f9cea57a002e6e4476ae780c
++// f8888b25626bea006e7f11f7add7cecc33d0fa2e
+--- a/include/linux/atomic/atomic-instrumented.h
++++ b/include/linux/atomic/atomic-instrumented.h
+@@ -1341,7 +1341,7 @@ atomic_try_cmpxchg_relaxed(atomic_t *v,
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -2905,7 +2905,7 @@ atomic64_try_cmpxchg_relaxed(atomic64_t
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -4469,7 +4469,7 @@ atomic_long_try_cmpxchg_relaxed(atomic_l
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -5000,4 +5000,4 @@ atomic_long_dec_if_positive(atomic_long_
+ 
+ 
+ #endif /* _LINUX_ATOMIC_INSTRUMENTED_H */
+-// 1568f875fef72097413caab8339120c065a39aa4
++// 5f7bb165838dcca35625e7d4b42540b790abd19b
+--- a/include/linux/atomic/atomic-long.h
++++ b/include/linux/atomic/atomic-long.h
+@@ -1527,7 +1527,7 @@ raw_atomic_long_try_cmpxchg_relaxed(atom
+ 
+ /**
+  * 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
+  *
+  * Atomically updates @v to (@v - @i) with full ordering.
+@@ -1795,4 +1795,4 @@ raw_atomic_long_dec_if_positive(atomic_l
+ }
+ 
+ #endif /* _LINUX_ATOMIC_LONG_H */
+-// 4ef23f98c73cff96d239896175fd26b10b88899e
++// f8204cfa718c04a01e3c7a15257ac85bbef54c23
+--- a/scripts/atomic/kerneldoc/sub_and_test
++++ b/scripts/atomic/kerneldoc/sub_and_test
+@@ -1,7 +1,7 @@
+ cat <<EOF
+ /**
+  * ${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
+  *
+  * Atomically updates @v to (@v - @i) with ${desc_order} ordering.

diff --git a/queue-6.6/series b/queue-6.6/series
index bd6689d79d855b0e03fa8809234d9649fd4dc74f..643b0889c517fb8c7a8b0abc8b7d78b22c112552 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -135,3 +135,4 @@ acpi-ec-evaluate-orphan-_reg-under-ec-device.patch
 arm64-defconfig-enable-the-vf610-gpio-driver.patch
 ext4-avoid-overflow-when-setting-values-via-sysfs.patch
 ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch
+locking-atomic-scripts-fix-atomic-_sub_and_test-kerneldoc.patch