Merge branch 'tracing/hw-branch-tracing' into tracing/core
[kernel.git] / include / linux / sched.h
index f4e3985..1ed4ef5 100644 (file)
@@ -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. */