diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /kernel/trace/ring_buffer.c | |
| parent | ftrace: display start of CPU buffer in trace output (diff) | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent (diff) | |
| download | linux-dev-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.xz linux-dev-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.zip | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
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 6781e9aab2c0..ee9b93d318b9 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1065,7 +1065,7 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, /* Did the write stamp get updated already? */ if (unlikely(ts < cpu_buffer->write_stamp)) - goto again; + delta = 0; if (test_time_stamp(delta)) { |