From: tip-bot for Jason Baron <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
torvalds@linux-foundation.org, peterz@infradead.org,
tglx@linutronix.de, jbaron@akamai.com
Subject: [tip:sched/core] sched: Remove extra static_key*() function indirection
Date: Wed, 16 Jul 2014 12:23:06 -0700 [thread overview]
Message-ID: <tip-6e76ea8a8209386c3cc7ee5594e6ea5d25525cf2@git.kernel.org> (raw)
In-Reply-To: <2ce52233ce200faad93b6029d90f1411cd926667.1404315388.git.jbaron@akamai.com>
Commit-ID: 6e76ea8a8209386c3cc7ee5594e6ea5d25525cf2
Gitweb: http://git.kernel.org/tip/6e76ea8a8209386c3cc7ee5594e6ea5d25525cf2
Author: Jason Baron <jbaron@akamai.com>
AuthorDate: Wed, 2 Jul 2014 15:52:41 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 16 Jul 2014 13:38:20 +0200
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>
---
kernel/sched/sched.h | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 1283945..579712f 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -887,20 +887,10 @@ enum {
#undef SCHED_FEAT
#if defined(CONFIG_SCHED_DEBUG) && defined(HAVE_JUMP_LABEL)
-static __always_inline bool static_branch__true(struct static_key *key)
-{
- return static_key_true(key); /* Not out of line branch. */
-}
-
-static __always_inline bool static_branch__false(struct static_key *key)
-{
- return static_key_false(key); /* Out of line branch. */
-}
-
#define SCHED_FEAT(name, enabled) \
static __always_inline bool static_branch_##name(struct static_key *key) \
{ \
- return static_branch__##enabled(key); \
+ return static_key_##enabled(key); \
}
#include "features.h"
next prev parent reply other threads:[~2014-07-16 19:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-02 15:52 [PATCH 0/2] sched: static_key sched_feat race + cleanup Jason Baron
2014-07-02 15:52 ` [PATCH 1/2] sched: remove extra static_key function indirection Jason Baron
2014-07-16 19:23 ` tip-bot for Jason Baron [this message]
2014-07-02 15:52 ` [PATCH 2/2] sched: fix static_key race with sched_feat Jason Baron
2014-07-16 19:23 ` [tip:sched/core] sched: Fix static_key race with sched_feat() tip-bot for Jason Baron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6e76ea8a8209386c3cc7ee5594e6ea5d25525cf2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jbaron@akamai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox