Skip to contentSkip to conversation

tracing fixes

GIT PULL Ingo Molnar 1 participant 1 message May 5, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest tracing-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus

Thanks,

Ingo

------------------>
Steven Rostedt (1):
tracing: fix ref count in splice pages

Stuart Bennett (1):
tracing: x86, mmiotrace: fix range test

 arch/x86/mm/kmmio.c  |    2 +-
 kernel/trace/trace.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/mm/kmmio.c +1 -1
index 4f115e0..50dc802 100644
@@ -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;
kernel/trace/trace.c +1 -0
index 1ce5dc6..a884c09 100644
@@ -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) {