diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-09-05 12:17:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-09-05 12:17:43 +0300 |
| commit | 95c13662b65c562d4902ad9f810378261347a749 (patch) | |
| tree | 036091f8615fdf2d00021709993b00790a630250 /kernel/jump_label.c | |
| parent | fe826cc2654e8561b64246325e6a51b62bf2488c (diff) | |
| parent | 2ab9d830262c132ab5db2f571003d80850d56b2a (diff) | |
| download | linux-95c13662b65c562d4902ad9f810378261347a749.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
This also refreshes the -rc1 based branch to -rc5.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/jump_label.c')
| -rw-r--r-- | kernel/jump_label.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index 4ad5ed8adf96..6dc76b590703 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)); |