Merge branch 'tracing/fastboot' into cpus4096

1 files changed, 20 insertions, 1 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index bf953932e67..423830b6e6e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -96,6 +96,7 @@ struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
 struct bio;
+struct bts_tracer;
 
 /*
  * List of flags we want to share for kernel threads,
@@ -1176,6 +1177,18 @@ struct task_struct {
         struct list_head ptraced;
         struct list_head ptrace_entry;
 
+#ifdef CONFIG_X86_PTRACE_BTS
+        /*
+         * This is the tracer handle for the ptrace BTS extension.
+         * This field actually belongs to the ptracer task.
+         */
+        struct bts_tracer *bts;
+        /*
+         * The buffer to hold the BTS data.
+         */
+        void *bts_buffer;
+#endif /* CONFIG_X86_PTRACE_BTS */
+
         /* PID/PID hash table linkage. */
         struct pid_link pids[PIDTYPE_MAX];
         struct list_head thread_group;
@@ -1367,7 +1380,7 @@ struct task_struct {
         unsigned long default_timer_slack_ns;
 
         struct list_head        *scm_work_list;
-#ifdef CONFIG_FUNCTION_RET_TRACER
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
         /* Index of current stored adress in ret_stack */
         int curr_ret_stack;
         /* Stack of return addresses for return function tracing */
@@ -1377,6 +1390,12 @@ struct task_struct {
          * because of depth overrun.
          */
         atomic_t trace_overrun;
+        /* Pause for the tracing */
+        atomic_t tracing_graph_pause;
+#endif
+#ifdef CONFIG_TRACING
+        /* state flags for use by tracers */
+        unsigned long trace;
 #endif
 };