Skip to content

Commit

Permalink
jump label: Remove static_branch()
Browse files Browse the repository at this point in the history
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:

  c5905af ("static keys: Introduce 'struct static_key', static_key_true()/false()
  and static_key_slow_[inc|dec]()").

Signed-off-by: Jason Baron <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Linus Torvalds <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/199332c47eef8005d5a5bf1018a80d25929a5746.1340909155.git.jbaron@redhat.com
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
jibaron authored and Ingo Molnar committed Jul 6, 2012
1 parent 326f418 commit 47fbc51
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions include/linux/jump_label.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*/

Expand Down Expand Up @@ -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[];

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 47fbc51

Please sign in to comment.