Merge branch 'for-linus' of git://neil.brown.name/md

[sfrench/cifs-2.6.git] / include / trace / sched.h

diff --git a/include/trace/sched.h b/include/trace/sched.h
index 0d81098ee9fce3b4ce9d7bc8b3a7280a6a41f95a..4e372a1a29bfed48fae67b26fb77ebb0c6f8feea 100644 (file)
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -4,53 +4,6 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
 
-DECLARE_TRACE(sched_kthread_stop,
-       TPPROTO(struct task_struct *t),
-               TPARGS(t));
-
-DECLARE_TRACE(sched_kthread_stop_ret,
-       TPPROTO(int ret),
-               TPARGS(ret));
-
-DECLARE_TRACE(sched_wait_task,
-       TPPROTO(struct rq *rq, struct task_struct *p),
-               TPARGS(rq, p));
-
-DECLARE_TRACE(sched_wakeup,
-       TPPROTO(struct rq *rq, struct task_struct *p, int success),
-               TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_wakeup_new,
-       TPPROTO(struct rq *rq, struct task_struct *p, int success),
-               TPARGS(rq, p, success));
-
-DECLARE_TRACE(sched_switch,
-       TPPROTO(struct rq *rq, struct task_struct *prev,
-               struct task_struct *next),
-               TPARGS(rq, prev, next));
-
-DECLARE_TRACE(sched_migrate_task,
-       TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
-               TPARGS(p, orig_cpu, dest_cpu));
-
-DECLARE_TRACE(sched_process_free,
-       TPPROTO(struct task_struct *p),
-               TPARGS(p));
-
-DECLARE_TRACE(sched_process_exit,
-       TPPROTO(struct task_struct *p),
-               TPARGS(p));
-
-DECLARE_TRACE(sched_process_wait,
-       TPPROTO(struct pid *pid),
-               TPARGS(pid));
-
-DECLARE_TRACE(sched_process_fork,
-       TPPROTO(struct task_struct *parent, struct task_struct *child),
-               TPARGS(parent, child));
-
-DECLARE_TRACE(sched_signal_send,
-       TPPROTO(int sig, struct task_struct *p),
-               TPARGS(sig, p));
+#include <trace/sched_event_types.h>
 
 #endif