diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-27 12:41:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-27 12:41:17 +0100 |
| commit | ff5a7088f0f04dd246e514f898cab0c863c3598d (patch) | |
| tree | 68a8f588e60fba05ee54b74b32a3269a72d130b9 /kernel/trace | |
| parent | 7e74efcf76c16f851df5c838c143c4a1865ea9fa (diff) | |
| parent | e3703f8cdfcf39c25c4338c3ad8e68891cca3731 (diff) | |
| download | lwn-ff5a7088f0f04dd246e514f898cab0c863c3598d.tar.gz lwn-ff5a7088f0f04dd246e514f898cab0c863c3598d.zip | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 294b8a271a04..fc4da2d97f9b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2397,6 +2397,13 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer, write &= RB_WRITE_MASK; tail = write - length; + /* + * If this is the first commit on the page, then it has the same + * timestamp as the page itself. + */ + if (!tail) + delta = 0; + /* See if we shot pass the end of this buffer page */ if (unlikely(write > BUF_PAGE_SIZE)) return rb_move_tail(cpu_buffer, length, tail, |