[PATCH 2/4] perf: Make use of updated jump label API.

From: Jason Baron
Date: Wed Dec 21 2011 - 14:10:25 EST


Use new jump label API.

Signed-off-by: Jason Baron <jbaron@xxxxxxxxxx>
---
include/linux/perf_event.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 564769c..a91989f 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1055,7 +1055,7 @@ perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)
{
struct pt_regs hot_regs;

- if (static_branch(&perf_swevent_enabled[event_id])) {
+ if (static_branch_def_false(&perf_swevent_enabled[event_id])) {
if (!regs) {
perf_fetch_caller_regs(&hot_regs);
regs = &hot_regs;
@@ -1069,7 +1069,7 @@ extern struct jump_label_key_deferred perf_sched_events;
static inline void perf_event_task_sched_in(struct task_struct *prev,
struct task_struct *task)
{
- if (static_branch(&perf_sched_events.key))
+ if (static_branch_def_false(&perf_sched_events.key))
__perf_event_task_sched_in(prev, task);
}

@@ -1078,7 +1078,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
{
perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, NULL, 0);

- if (static_branch(&perf_sched_events.key))
+ if (static_branch_def_false(&perf_sched_events.key))
__perf_event_task_sched_out(prev, next);
}

--
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/