diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 12:08:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 12:08:02 -0700 |
| commit | e91b3b2681148371d84b9cdf4cab6f9de0522544 (patch) | |
| tree | 3b14f9abef903f70dbd48540cebb1da041cc01ac | |
| parent | 5e30302b9ee75a01d65d8dcf4085254a5da1066d (diff) | |
| parent | 33015c85995716d03f6293346cf05a1908b0fb9a (diff) | |
| download | op-kernel-dev-e91b3b2681148371d84b9cdf4cab6f9de0522544.zip op-kernel-dev-e91b3b2681148371d84b9cdf4cab6f9de0522544.tar.gz | |
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
| -rw-r--r-- | arch/x86/mm/kmmio.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 4f115e0..50dc802 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c @@ -87,7 +87,7 @@ static struct kmmio_probe *get_kmmio_probe(unsigned long addr) { struct kmmio_probe *p; list_for_each_entry_rcu(p, &kmmio_probes, list) { - if (addr >= p->addr && addr <= (p->addr + p->len)) + if (addr >= p->addr && addr < (p->addr + p->len)) return p; } return NULL; diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1ce5dc6..a884c09 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) { |
