diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:08:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:08:02 -0400 |
| commit | e91b3b2681148371d84b9cdf4cab6f9de0522544 (patch) | |
| tree | 3b14f9abef903f70dbd48540cebb1da041cc01ac /kernel | |
| parent | 5e30302b9ee75a01d65d8dcf4085254a5da1066d (diff) | |
| parent | 33015c85995716d03f6293346cf05a1908b0fb9a (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:
tracing: x86, mmiotrace: fix range test
tracing: fix ref count in splice pages
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1ce5dc6372b8..a884c09006c4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -3448,6 +3448,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, | |||
| 3448 | if (!ref) | 3448 | if (!ref) |
| 3449 | break; | 3449 | break; |
| 3450 | 3450 | ||
| 3451 | ref->ref = 1; | ||
| 3451 | ref->buffer = info->tr->buffer; | 3452 | ref->buffer = info->tr->buffer; |
| 3452 | ref->page = ring_buffer_alloc_read_page(ref->buffer); | 3453 | ref->page = ring_buffer_alloc_read_page(ref->buffer); |
| 3453 | if (!ref->page) { | 3454 | if (!ref->page) { |