summaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
parentd580ff8699e8811a9af37e9de4dea375401bdeec (diff)
downloadlinux-3b6e901f839f42afb40f614418df82c08b01320a.tar.gz
linux-3b6e901f839f42afb40f614418df82c08b01320a.tar.bz2
linux-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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/tracepoint.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index d6073a50a6ca..e95ee7f31d43 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);