diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2024-08-14 11:05:36 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2024-08-14 11:05:36 -0400 |
| commit | 2a0746e7656990fa60429298671cbb8eedc928e9 (patch) | |
| tree | 42fe91bc9e8f1a1d1abaf28650f374f5b07c1f71 | |
| parent | Linux patch 6.1.105 (diff) | |
| download | linux-patches-6.1.tar.gz linux-patches-6.1.tar.bz2 linux-patches-6.1.zip | |
Removed:
2960_jump-label-fix.patch
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 2960_jump-label-fix.patch | 57 |
2 files changed, 0 insertions, 61 deletions
diff --git a/0000_README b/0000_README index e2c1d859..a89ea6e6 100644 --- a/0000_README +++ b/0000_README @@ -499,10 +499,6 @@ Patch: 2950_kbuild-CRC32-1MB-dict-xz-modules.patch From: https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=kbuild&id=fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28 Desc: kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules -Patch: 2960_jump-label-fix.patch -From: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/ -Desc: jump_label: Fix a regression - Patch: 3000_Support-printing-firmware-info.patch From: https://bugs.gentoo.org/732852 Desc: Print firmware info (Reqs CONFIG_GENTOO_PRINT_FIRMWARE_INFO). Thanks to Georgy Yakovlev diff --git a/2960_jump-label-fix.patch b/2960_jump-label-fix.patch deleted file mode 100644 index 1a5fdf7a..00000000 --- a/2960_jump-label-fix.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 224fa3552029a3d14bec7acf72ded8171d551b88 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <peterz@infradead.org> -Date: Wed, 31 Jul 2024 12:43:21 +0200 -Subject: jump_label: Fix the fix, brown paper bags galore - -Per the example of: - - !atomic_cmpxchg(&key->enabled, 0, 1) - -the inverse was written as: - - atomic_cmpxchg(&key->enabled, 1, 0) - -except of course, that while !old is only true for old == 0, old is -true for everything except old == 0. - -Fix it to read: - - atomic_cmpxchg(&key->enabled, 1, 0) == 1 - -such that only the 1->0 transition returns true and goes on to disable -the keys. - -Fixes: 83ab38ef0a0b ("jump_label: Fix concurrency issues in static_key_slow_dec()") -Reported-by: Darrick J. Wong <djwong@kernel.org> -Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> -Tested-by: Darrick J. Wong <djwong@kernel.org> -Link: https://lkml.kernel.org/r/20240731105557.GY33588@noisy.programming.kicks-ass.net ---- - kernel/jump_label.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/jump_label.c b/kernel/jump_label.c -index 4ad5ed8adf9691..6dc76b590703ed 100644 ---- a/kernel/jump_label.c -+++ b/kernel/jump_label.c -@@ -236,7 +236,7 @@ void static_key_disable_cpuslocked(struct static_key *key) - } - - jump_label_lock(); -- if (atomic_cmpxchg(&key->enabled, 1, 0)) -+ if (atomic_cmpxchg(&key->enabled, 1, 0) == 1) - jump_label_update(key); - jump_label_unlock(); - } -@@ -289,7 +289,7 @@ static void __static_key_slow_dec_cpuslocked(struct static_key *key) - return; - - guard(mutex)(&jump_label_mutex); -- if (atomic_cmpxchg(&key->enabled, 1, 0)) -+ if (atomic_cmpxchg(&key->enabled, 1, 0) == 1) - jump_label_update(key); - else - WARN_ON_ONCE(!static_key_slow_try_dec(key)); --- -cgit 1.2.3-korg - |