diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /kernel/trace/trace.h | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index cc7a4f864036..4d3d381bfd95 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -368,7 +368,7 @@ struct trace_iterator { | |||
| 368 | loff_t pos; | 368 | loff_t pos; |
| 369 | long idx; | 369 | long idx; |
| 370 | 370 | ||
| 371 | cpumask_t started; | 371 | cpumask_var_t started; |
| 372 | }; | 372 | }; |
| 373 | 373 | ||
| 374 | int tracing_is_enabled(void); | 374 | int tracing_is_enabled(void); |