jump label: Remove static_branch() (47fbc518) · Commits · 戴 / test

Remove the obsolete static_branch() interface, since the supported interface is now static_key_false()/true() - which is used by all in-tree code. See commit: ("static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()"). Signed-off-by:

Jason Baron <jbaron@redhat.com> Cc: rostedt@goodmis.org Cc: mathieu.desnoyers@efficios.com Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/199332c47eef8005d5a5bf1018a80d25929a5746.1340909155.git.jbaron@redhat.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

include/linux/jump_label.h

+1 −16

Original line number	Diff line number	Diff line
		@@ -42,8 +42,7 @@
		* allowed.
		*
		* Not initializing the key (static data is initialized to 0s anyway) is the
		* same as using STATIC_KEY_INIT_FALSE and static_key_false() is
		* equivalent with static_branch().
		* same as using STATIC_KEY_INIT_FALSE.
		*
		*/

		@@ -107,12 +106,6 @@ static __always_inline bool static_key_true(struct static_key *key)
		return !static_key_false(key);
		}

		/* Deprecated. Please use 'static_key_false() instead. */
		static __always_inline bool static_branch(struct static_key *key)
		{
		return arch_static_branch(key);
		}

		extern struct jump_entry __start___jump_table[];
		extern struct jump_entry __stop___jump_table[];

		@@ -166,14 +159,6 @@ static __always_inline bool static_key_true(struct static_key *key)
		return false;
		}

		/* Deprecated. Please use 'static_key_false() instead. */
		static __always_inline bool static_branch(struct static_key *key)
		{
		if (unlikely(atomic_read(&key->enabled)) > 0)
		return true;
		return false;
		}

		static inline void static_key_slow_inc(struct static_key *key)
		{
		atomic_inc(&key->enabled);

Admin message