diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 11:10:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 11:10:03 +0100 |
| commit | 9b03638963e4b239dff1b424b91062a710d4b2e9 (patch) | |
| tree | 184bbcc7160c5d0e304166b1ecb190897e1f0afc /kernel/trace/ring_buffer.c | |
| parent | Merge branch 'tracing/ftrace' into tracing/core (diff) | |
| parent | ring-buffer: reset timestamps when ring buffer is reset (diff) | |
| download | linux-9b03638963e4b239dff1b424b91062a710d4b2e9.tar.gz linux-9b03638963e4b239dff1b424b91062a710d4b2e9.zip | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 0b9de5a3d699..7839280ffcd8 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2166,6 +2166,9 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) cpu_buffer->overrun = 0; cpu_buffer->entries = 0; + + cpu_buffer->write_stamp = 0; + cpu_buffer->read_stamp = 0; } /** @@ -2266,9 +2269,24 @@ int ring_buffer_swap_cpu(struct ring_buffer *buffer_a, if (buffer_a->pages != buffer_b->pages) return -EINVAL; + if (ring_buffer_flags != RB_BUFFERS_ON) + return -EAGAIN; + + if (atomic_read(&buffer_a->record_disabled)) + return -EAGAIN; + + if (atomic_read(&buffer_b->record_disabled)) + return -EAGAIN; + cpu_buffer_a = buffer_a->buffers[cpu]; cpu_buffer_b = buffer_b->buffers[cpu]; + if (atomic_read(&cpu_buffer_a->record_disabled)) + return -EAGAIN; + + if (atomic_read(&cpu_buffer_b->record_disabled)) + return -EAGAIN; + /* * We can't do a synchronize_sched here because this * function can be called in atomic context. |