diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 21:08:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 21:08:02 +0200 |
| commit | e91b3b2681148371d84b9cdf4cab6f9de0522544 (patch) | |
| tree | 3b14f9abef903f70dbd48540cebb1da041cc01ac /kernel | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | tracing: x86, mmiotrace: fix range test (diff) | |
| download | linux-e91b3b2681148371d84b9cdf4cab6f9de0522544.tar.xz linux-e91b3b2681148371d84b9cdf4cab6f9de0522544.zip | |
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, if (!ref) break; + ref->ref = 1; ref->buffer = info->tr->buffer; ref->page = ring_buffer_alloc_read_page(ref->buffer); if (!ref->page) { |