diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /kernel/trace/ring_buffer.c | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
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, | |||
| 1065 | 1065 | ||
| 1066 | /* Did the write stamp get updated already? */ | 1066 | /* Did the write stamp get updated already? */ |
| 1067 | if (unlikely(ts < cpu_buffer->write_stamp)) | 1067 | if (unlikely(ts < cpu_buffer->write_stamp)) |
| 1068 | goto again; | 1068 | delta = 0; |
| 1069 | 1069 | ||
| 1070 | if (test_time_stamp(delta)) { | 1070 | if (test_time_stamp(delta)) { |
| 1071 | 1071 | ||