From 0652d8e029460854145a9ed18589c2e4d108b480 Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron@redhat.com>
Date: Tue, 28 Feb 2012 13:49:01 -0500
Subject: [PATCH] --- yaml --- r: 288700 b: refs/heads/master c:
 8eedce996556d7d06522cd3a0e6069141c8dffe0 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/jump_label.h | 11 +++++------
 trunk/kernel/jump_label.c        |  6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index f58f685f1ee2..8ddd4cd383d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a706d4fc9e56d8e46393533e0cdca2d35fa5c7e5
+refs/heads/master: 8eedce996556d7d06522cd3a0e6069141c8dffe0
diff --git a/trunk/include/linux/jump_label.h b/trunk/include/linux/jump_label.h
index 2172da2d9bb4..c513a40510f5 100644
--- a/trunk/include/linux/jump_label.h
+++ b/trunk/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/trunk/kernel/jump_label.c b/trunk/kernel/jump_label.c
index bf9dcadbb53a..43049192b5ec 100644
--- a/trunk/kernel/jump_label.c
+++ b/trunk/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;