aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-10-14 21:10:38 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-18 19:58:56 +0200
commit3b6e901f839f42afb40f614418df82c08b01320a (patch)
tree04056f3347b926e9623c225acd496e39b9d1b85a
parentd580ff8699e8811a9af37e9de4dea375401bdeec (diff)
downloadmrst-s0i3-test-3b6e901f839f42afb40f614418df82c08b01320a.tar.gz
mrst-s0i3-test-3b6e901f839f42afb40f614418df82c08b01320a.tar.xz
mrst-s0i3-test-3b6e901f839f42afb40f614418df82c08b01320a.zip
jump_label: Use more consistent naming
Now that there's still only a few users around, rename things to make them more consistent. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20101014203625.448565169@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/jump_label.h8
-rw-r--r--kernel/tracepoint.c6
-rw-r--r--lib/dynamic_debug.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index b72cd9f92c2..81be4962b7a 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -25,10 +25,10 @@ extern void jump_label_update(unsigned long key, enum jump_label_type type);
extern void jump_label_apply_nops(struct module *mod);
extern int jump_label_text_reserved(void *start, void *end);
-#define enable_jump_label(key) \
+#define jump_label_enable(key) \
jump_label_update((unsigned long)key, JUMP_LABEL_ENABLE);
-#define disable_jump_label(key) \
+#define jump_label_disable(key) \
jump_label_update((unsigned long)key, JUMP_LABEL_DISABLE);
#else
@@ -39,12 +39,12 @@ do { \
goto label; \
} while (0)
-#define enable_jump_label(cond_var) \
+#define jump_label_enable(cond_var) \
do { \
*(cond_var) = 1; \
} while (0)
-#define disable_jump_label(cond_var) \
+#define jump_label_disable(cond_var) \
do { \
*(cond_var) = 0; \
} while (0)
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index d6073a50a6c..e95ee7f31d4 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -265,10 +265,10 @@ static void set_tracepoint(struct tracepoint_entry **entry,
*/
rcu_assign_pointer(elem->funcs, (*entry)->funcs);
if (!elem->state && active) {
- enable_jump_label(&elem->state);
+ jump_label_enable(&elem->state);
elem->state = active;
} else if (elem->state && !active) {
- disable_jump_label(&elem->state);
+ jump_label_disable(&elem->state);
elem->state = active;
}
}
@@ -285,7 +285,7 @@ static void disable_tracepoint(struct tracepoint *elem)
elem->unregfunc();
if (elem->state) {
- disable_jump_label(&elem->state);
+ jump_label_disable(&elem->state);
elem->state = 0;
}
rcu_assign_pointer(elem->funcs, NULL);
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index e925c7b960f..7bd6df781ce 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -142,9 +142,9 @@ static void ddebug_change(const struct ddebug_query *query,
dt->num_enabled++;
dp->flags = newflags;
if (newflags) {
- enable_jump_label(&dp->enabled);
+ jump_label_enable(&dp->enabled);
} else {
- disable_jump_label(&dp->enabled);
+ jump_label_disable(&dp->enabled);
}
if (verbose)
printk(KERN_INFO