Merge branch 'tracing/hw-branch-tracing' into tracing/core

[linux-2.6-block.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index f4e3985c85930edb7f461ed8016596cabdc50dac..1ed4ef520680902396abbe3c3e1b00ba47391f15 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1421,7 +1421,9 @@ struct task_struct {
 #ifdef CONFIG_TRACING
        /* state flags for use by tracers */
        unsigned long trace;
-#endif
+       /* bitmask of trace recursion */
+       unsigned long trace_recursion;
+#endif /* CONFIG_TRACING */
 };
 
 /* Future-safe accessor for struct task_struct's cpus_allowed. */