Patched in Tegra support.

1 files changed, 4 insertions, 43 deletions

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 5a8671e8a67..f6334782a59 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -6,7 +6,6 @@
 
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
-#include <linux/binfmts.h>
 
 /*
  * Tracepoint for calling kthread_stop, performed to end a kthread:
@@ -73,9 +72,6 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
                 __entry->prio           = p->prio;
                 __entry->success        = success;
                 __entry->target_cpu     = task_cpu(p);
-        )
-        TP_perf_assign(
-                __perf_task(p);
         ),
 
         TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",
@@ -104,7 +100,7 @@ static inline long __trace_sched_switch_state(struct task_struct *p)
          * For all intents and purposes a preempted task is a running task.
          */
         if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE)
-                state = TASK_RUNNING | TASK_STATE_MAX;
+                state = TASK_RUNNING;
 #endif
 
         return state;
@@ -141,14 +137,13 @@ TRACE_EVENT(sched_switch,
                 __entry->next_prio      = next->prio;
         ),
 
-        TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_pid=%d next_prio=%d",
+        TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s ==> next_comm=%s next_pid=%d next_prio=%d",
                 __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
-                __entry->prev_state & (TASK_STATE_MAX-1) ?
-                  __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",
+                __entry->prev_state ?
+                  __print_flags(__entry->prev_state, "|",
                                 { 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
                                 { 16, "Z" }, { 32, "X" }, { 64, "x" },
                                 { 128, "W" }) : "R",
-                __entry->prev_state & TASK_STATE_MAX ? "+" : "",
                 __entry->next_comm, __entry->next_pid, __entry->next_prio)
 );
 
@@ -280,32 +275,6 @@ TRACE_EVENT(sched_process_fork,
 );
 
 /*
- * Tracepoint for exec:
- */
-TRACE_EVENT(sched_process_exec,
-
-        TP_PROTO(struct task_struct *p, pid_t old_pid,
-                 struct linux_binprm *bprm),
-
-        TP_ARGS(p, old_pid, bprm),
-
-        TP_STRUCT__entry(
-                __string(       filename,       bprm->filename  )
-                __field(        pid_t,          pid             )
-                __field(        pid_t,          old_pid         )
-        ),
-
-        TP_fast_assign(
-                __assign_str(filename, bprm->filename);
-                __entry->pid            = p->pid;
-                __entry->old_pid        = old_pid;
-        ),
-
-        TP_printk("filename=%s pid=%d old_pid=%d", __get_str(filename),
-                  __entry->pid, __entry->old_pid)
-);
-
-/*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
  *     adding sched_stat support to SCHED_FIFO/RR would be welcome.
  */
@@ -328,7 +297,6 @@ DECLARE_EVENT_CLASS(sched_stat_template,
         )
         TP_perf_assign(
                 __perf_count(delay);
-                __perf_task(tsk);
         ),
 
         TP_printk("comm=%s pid=%d delay=%Lu [ns]",
@@ -362,13 +330,6 @@ DEFINE_EVENT(sched_stat_template, sched_stat_iowait,
              TP_ARGS(tsk, delay));
 
 /*
- * Tracepoint for accounting blocked time (time the task is in uninterruptible).
- */
-DEFINE_EVENT(sched_stat_template, sched_stat_blocked,
-             TP_PROTO(struct task_struct *tsk, u64 delay),
-             TP_ARGS(tsk, delay));
-
-/*
  * Tracepoint for accounting runtime (time the task is executing
  * on a CPU).
  */