diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-27 14:28:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-27 14:28:09 +0200 |
| commit | d6a72fe465f4c54654a1d5488daeb820b4ecf275 (patch) | |
| tree | 1b581d3b3452b47ba35e1ee3c96d05c030ed9726 /include/linux/sched.h | |
| parent | b1d2dc3c06d8da7d58fb43d7123a91c1d6a4f576 (diff) | |
| parent | b1cff0ad1062621ae63cb6c5dc4165191fe2e9f1 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index f18300eddfc..106bd8a4599 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1535,7 +1535,7 @@ struct task_struct { #ifdef CONFIG_TRACING /* state flags for use by tracers */ unsigned long trace; - /* bitmask of trace recursion */ + /* bitmask and counter of trace recursion */ unsigned long trace_recursion; #endif /* CONFIG_TRACING */ #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */ |