summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-10-17 12:15:00 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-18 19:59:01 +0200
commitebf31f502492527e2b6b5e5cf85a4ebc7fc8a52e (patch)
tree71d65e73fedaee937d90b52d6efa1d9cbeaeff42 /include
parent7e54a5a0b655734326dc78c2b5efc1eb35497bb6 (diff)
jump_label: Add COND_STMT(), reducer wrappery
The use of the JUMP_LABEL() construct ends up creating endless silly wrappers, create a higher level construct to reduce this clutter. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Jason Baron <jbaron@redhat.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/jump_label.h10
-rw-r--r--include/linux/perf_event.h12
2 files changed, 12 insertions, 10 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 81be4962b7a1..b67cb180e6e9 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -61,4 +61,14 @@ static inline int jump_label_text_reserved(void *start, void *end)
#endif
+#define COND_STMT(key, stmt) \
+do { \
+ __label__ jl_enabled; \
+ JUMP_LABEL(key, jl_enabled); \
+ if (0) { \
+jl_enabled: \
+ stmt; \
+ } \
+} while (0)
+
#endif
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3b80cbf509ef..057bf22a8323 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -903,21 +903,13 @@ extern atomic_t perf_task_events;
static inline void perf_event_task_sched_in(struct task_struct *task)
{
- JUMP_LABEL(&perf_task_events, have_events);
- return;
-
-have_events:
- __perf_event_task_sched_in(task);
+ COND_STMT(&perf_task_events, __perf_event_task_sched_in(task));
}
static inline
void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next)
{
- JUMP_LABEL(&perf_task_events, have_events);
- return;
-
-have_events:
- __perf_event_task_sched_out(task, next);
+ COND_STMT(&perf_task_events, __perf_event_task_sched_out(task, next));
}
extern int perf_event_init_task(struct task_struct *child);