diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-23 09:10:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-23 09:10:29 +0200 |
| commit | 3a01736e70a7d629140695ba46a901266b4460cc (patch) | |
| tree | 49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253 /kernel/trace/ring_buffer.c | |
| parent | 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb (diff) | |
| parent | 24a461d537f49f9da6533d83100999ea08c6c755 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 28d0615a513..3632ce87674 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -443,6 +443,7 @@ int ring_buffer_print_page_header(struct trace_seq *s) */ struct ring_buffer_per_cpu { int cpu; + atomic_t record_disabled; struct ring_buffer *buffer; spinlock_t reader_lock; /* serialize readers */ arch_spinlock_t lock; @@ -462,7 +463,6 @@ struct ring_buffer_per_cpu { unsigned long read; u64 write_stamp; u64 read_stamp; - atomic_t record_disabled; }; struct ring_buffer { |