diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:51:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 13:51:50 -0500 |
| commit | 09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 (patch) | |
| tree | 9859b9ec3b5979af6b177155ef847f97fba19a6a /kernel/trace/ring_buffer.c | |
| parent | 04ca2c17e3fae2d3f73aa5ad533242d556cadf5a (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ring-buffer: prevent infinite looping on time stamping
ftrace: disable tracing on resize
ftrace: fix breakage in bin_fmt results
ftrace: ftrace.txt version update
ftrace: update txt document
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 3f3380638646..2f76193c3489 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -1060,7 +1060,7 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, | |||
| 1060 | 1060 | ||
| 1061 | /* Did the write stamp get updated already? */ | 1061 | /* Did the write stamp get updated already? */ |
| 1062 | if (unlikely(ts < cpu_buffer->write_stamp)) | 1062 | if (unlikely(ts < cpu_buffer->write_stamp)) |
| 1063 | goto again; | 1063 | delta = 0; |
| 1064 | 1064 | ||
| 1065 | if (test_time_stamp(delta)) { | 1065 | if (test_time_stamp(delta)) { |
| 1066 | 1066 | ||