Commit 19833ae2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 4b6c6065 d0c00640

kernel/jump_label.c

+2 −6
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ EXPORT_SYMBOL_GPL(static_key_count); 


void static_key_slow_inc_cpuslocked(struct static_key *key)

{

	int v, v1;



	STATIC_KEY_CHECK_USE(key);

	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

	 * atomic_inc_unless_negative() checks >= 0, so roll our own.

	 */

	for (v = atomic_read(&key->enabled); v > 0; v = v1) {

		v1 = atomic_cmpxchg(&key->enabled, v, v + 1);

		if (likely(v1 == v))

	for (int v = atomic_read(&key->enabled); v > 0; )

		if (likely(atomic_try_cmpxchg(&key->enabled, &v, v + 1)))

			return;

	}



	jump_label_lock();

	if (atomic_read(&key->enabled) == 0) {