From: Jason Baron <jbaron@redhat.com>
To: a.p.zijlstra@chello.nl
Cc: rostedt@goodmis.org, mathieu.desnoyers@efficios.com,
hpa@zytor.com, mingo@elte.hu, davem@davemloft.net,
ddaney.cavm@gmail.com, pjt@google.com, rth@redhat.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] tracepoints: update to use new jump label API.
Date: Wed, 21 Dec 2011 14:09:14 -0500 [thread overview]
Message-ID: <b33f44d9560af35d3ec371ede7cb92f6011f5bf5.1324493360.git.jbaron@redhat.com> (raw)
In-Reply-To: <cover.1324493360.git.jbaron@redhat.com>
Update tracepoints.
Signed-off-by: Jason Baron <jbaron@redhat.com>
---
include/linux/tracepoint.h | 4 ++--
kernel/tracepoint.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index df0a779..d167ec2 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -143,7 +143,7 @@ static inline void tracepoint_synchronize_unregister(void)
extern struct tracepoint __tracepoint_##name; \
static inline void trace_##name(proto) \
{ \
- if (static_branch(&__tracepoint_##name.key)) \
+ if (static_branch_def_false(&__tracepoint_##name.key)) \
__DO_TRACE(&__tracepoint_##name, \
TP_PROTO(data_proto), \
TP_ARGS(data_args), \
@@ -176,7 +176,7 @@ static inline void tracepoint_synchronize_unregister(void)
__attribute__((section("__tracepoints_strings"))) = #name; \
struct tracepoint __tracepoint_##name \
__attribute__((section("__tracepoints"))) = \
- { __tpstrtab_##name, JUMP_LABEL_INIT, reg, unreg, NULL };\
+ { __tpstrtab_##name, JUMP_LABEL_INIT_FALSE, reg, unreg, NULL };\
static struct tracepoint * const __tracepoint_ptr_##name __used \
__attribute__((section("__tracepoints_ptrs"))) = \
&__tracepoint_##name;
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index db110b8..bc7f0ea 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -256,9 +256,9 @@ static void set_tracepoint(struct tracepoint_entry **entry,
{
WARN_ON(strcmp((*entry)->name, elem->name) != 0);
- if (elem->regfunc && !jump_label_enabled(&elem->key) && active)
+ if (elem->regfunc && !jump_label_true(&elem->key) && active)
elem->regfunc();
- else if (elem->unregfunc && jump_label_enabled(&elem->key) && !active)
+ else if (elem->unregfunc && jump_label_true(&elem->key) && !active)
elem->unregfunc();
/*
@@ -269,9 +269,9 @@ static void set_tracepoint(struct tracepoint_entry **entry,
* is used.
*/
rcu_assign_pointer(elem->funcs, (*entry)->funcs);
- if (active && !jump_label_enabled(&elem->key))
+ if (active && !jump_label_true(&elem->key))
jump_label_inc(&elem->key);
- else if (!active && jump_label_enabled(&elem->key))
+ else if (!active && jump_label_true(&elem->key))
jump_label_dec(&elem->key);
}
@@ -283,10 +283,10 @@ static void set_tracepoint(struct tracepoint_entry **entry,
*/
static void disable_tracepoint(struct tracepoint *elem)
{
- if (elem->unregfunc && jump_label_enabled(&elem->key))
+ if (elem->unregfunc && jump_label_true(&elem->key))
elem->unregfunc();
- if (jump_label_enabled(&elem->key))
+ if (jump_label_true(&elem->key))
jump_label_dec(&elem->key);
rcu_assign_pointer(elem->funcs, NULL);
}
--
1.7.7.3
next prev parent reply other threads:[~2011-12-21 19:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 19:09 [PATCH 0/4][RFC] jump label: introduce default true branch Jason Baron
2011-12-21 19:09 ` [PATCH 1/4] jump label: Introduce default true branch + API update Jason Baron
2011-12-21 19:09 ` [PATCH 2/4] perf: Make use of updated jump label API Jason Baron
2011-12-21 19:09 ` Jason Baron [this message]
2011-12-21 19:09 ` [PATCH 4/4] sched: Make use of new " Jason Baron
2011-12-21 19:49 ` [PATCH 0/4][RFC] jump label: introduce default true branch Peter Zijlstra
2012-02-20 22:47 ` H. Peter Anvin
2012-02-20 22:51 ` Peter Zijlstra
2012-02-21 14:35 ` 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=b33f44d9560af35d3ec371ede7cb92f6011f5bf5.1324493360.git.jbaron@redhat.com \
--to=jbaron@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=davem@davemloft.net \
--cc=ddaney.cavm@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@elte.hu \
--cc=pjt@google.com \
--cc=rostedt@goodmis.org \
--cc=rth@redhat.com \
/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
all inboxes | Powered by JetHome®