Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core

This commit is contained in:
Ingo Molnar
2009-02-13 10:25:18 +01:00
140 changed files with 1090 additions and 631 deletions

View File

@@ -273,8 +273,8 @@ struct ring_buffer {
unsigned pages;
unsigned flags;
int cpus;
cpumask_var_t cpumask;
atomic_t record_disabled;
cpumask_var_t cpumask;
struct mutex mutex;