ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull in locking/core from tip (just a single patch) to avoid a conflict
with a jump_label change needed by a TCP cleanup.

Link: https://lore.kernel.org/all/Y4B17nBArWS1Iywo@hirez.programming.kicks-ass.net/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2022-12-01 15:36:27 -08:00
parent 4b6c6065fc d0c006402e
commit 19833ae270
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/jump_label.c
View File

@@ -115,8 +115,6 @@ EXPORT_SYMBOL_GPL(static_key_count);
void static_key_slow_inc_cpuslocked(struct static_key *key) void static_key_slow_inc_cpuslocked(struct static_key *key)
{ {
int v, v1;
STATIC_KEY_CHECK_USE(key); STATIC_KEY_CHECK_USE(key);
lockdep_assert_cpus_held(); lockdep_assert_cpus_held();
@@ -132,11 +130,9 @@ void static_key_slow_inc_cpuslocked(struct static_key *key)
* so it counts as "enabled" in jump_label_update(). Note that * so it counts as "enabled" in jump_label_update(). Note that
* atomic_inc_unless_negative() checks >= 0, so roll our own. * atomic_inc_unless_negative() checks >= 0, so roll our own.
*/ */
for (v = atomic_read(&key->enabled); v > 0; v = v1) { for (int v = atomic_read(&key->enabled); v > 0; )
v1 = atomic_cmpxchg(&key->enabled, v, v + 1); if (likely(atomic_try_cmpxchg(&key->enabled, &v, v + 1)))
if (likely(v1 == v))
return; return;
}
jump_label_lock(); jump_label_lock();
if (atomic_read(&key->enabled) == 0) { if (atomic_read(&key->enabled) == 0) {