[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-8eedce996556d7d06522cd3a0e6069141c8dffe0@git.kernel.org>
Date: Wed, 29 Feb 2012 02:17:21 -0800
From: tip-bot for Jason Baron <jbaron@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
jbaron@...hat.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/core] static keys: Inline the static_key_enabled()
function
Commit-ID: 8eedce996556d7d06522cd3a0e6069141c8dffe0
Gitweb: http://git.kernel.org/tip/8eedce996556d7d06522cd3a0e6069141c8dffe0
Author: Jason Baron <jbaron@...hat.com>
AuthorDate: Tue, 28 Feb 2012 13:49:01 -0500
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Tue, 28 Feb 2012 20:01:08 +0100
static keys: Inline the static_key_enabled() function
In the jump label enabled case, calling static_key_enabled()
results in a function call. The function returns the results of
a compare, so it really doesn't need the overhead of a full
function call. Let's make it 'static inline' for both the jump
label enabled and disabled cases.
Signed-off-by: Jason Baron <jbaron@...hat.com>
Cc: a.p.zijlstra@...llo.nl
Cc: rostedt@...dmis.org
Cc: mathieu.desnoyers@...ymtl.ca
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: http://lkml.kernel.org/r/201202281849.q1SIn1p2023270@int-mx10.intmail.prod.int.phx2.redhat.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
include/linux/jump_label.h | 11 +++++------
kernel/jump_label.c | 6 ------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 2172da2..c513a40 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -127,7 +127,6 @@ extern int jump_label_text_reserved(void *start, void *end);
extern void static_key_slow_inc(struct static_key *key);
extern void static_key_slow_dec(struct static_key *key);
extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
-extern bool static_key_enabled(struct static_key *key);
extern void jump_label_apply_nops(struct module *mod);
extern void
jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
@@ -198,11 +197,6 @@ static inline int jump_label_text_reserved(void *start, void *end)
static inline void jump_label_lock(void) {}
static inline void jump_label_unlock(void) {}
-static inline bool static_key_enabled(struct static_key *key)
-{
- return (atomic_read(&key->enabled) > 0);
-}
-
static inline int jump_label_apply_nops(struct module *mod)
{
return 0;
@@ -224,4 +218,9 @@ jump_label_rate_limit(struct static_key_deferred *key,
#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE
#define jump_label_enabled static_key_enabled
+static inline bool static_key_enabled(struct static_key *key)
+{
+ return (atomic_read(&key->enabled) > 0);
+}
+
#endif /* _LINUX_JUMP_LABEL_H */
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index bf9dcad..4304919 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -29,12 +29,6 @@ void jump_label_unlock(void)
mutex_unlock(&jump_label_mutex);
}
-bool static_key_enabled(struct static_key *key)
-{
- return (atomic_read(&key->enabled) > 0);
-}
-EXPORT_SYMBOL_GPL(static_key_enabled);
-
static int jump_label_cmp(const void *a, const void *b)
{
const struct jump_entry *jea = a;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists