diff options
author | Jason Baron <jbaron@akamai.com> | 2014-07-02 11:52:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-07-16 07:38:20 -0400 |
commit | 6e76ea8a8209386c3cc7ee5594e6ea5d25525cf2 (patch) | |
tree | 524b2288f889389cf7ed18743a0a0703d14e593f /kernel/sched | |
parent | 1b09d29bc00964d9032d80516f958044ac6b3805 (diff) |
sched: Remove extra static_key*() function indirection
I think its a bit simpler without having to follow an extra layer of static
inline fuctions. No functional change just cosmetic.
Signed-off-by: Jason Baron <jbaron@akamai.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: rostedt@goodmis.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/2ce52233ce200faad93b6029d90f1411cd926667.1404315388.git.jbaron@akamai.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/sched.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1283945d1ace..579712f4e9d5 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -887,20 +887,10 @@ enum { | |||
887 | #undef SCHED_FEAT | 887 | #undef SCHED_FEAT |
888 | 888 | ||
889 | #if defined(CONFIG_SCHED_DEBUG) && defined(HAVE_JUMP_LABEL) | 889 | #if defined(CONFIG_SCHED_DEBUG) && defined(HAVE_JUMP_LABEL) |
890 | static __always_inline bool static_branch__true(struct static_key *key) | ||
891 | { | ||
892 | return static_key_true(key); /* Not out of line branch. */ | ||
893 | } | ||
894 | |||
895 | static __always_inline bool static_branch__false(struct static_key *key) | ||
896 | { | ||
897 | return static_key_false(key); /* Out of line branch. */ | ||
898 | } | ||
899 | |||
900 | #define SCHED_FEAT(name, enabled) \ | 890 | #define SCHED_FEAT(name, enabled) \ |
901 | static __always_inline bool static_branch_##name(struct static_key *key) \ | 891 | static __always_inline bool static_branch_##name(struct static_key *key) \ |
902 | { \ | 892 | { \ |
903 | return static_branch__##enabled(key); \ | 893 | return static_key_##enabled(key); \ |
904 | } | 894 | } |
905 | 895 | ||
906 | #include "features.h" | 896 | #include "features.h" |