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

+2 -1
+1 -1
arch/x86/mm/kmmio.c
··· 87 { 88 struct kmmio_probe *p; 89 list_for_each_entry_rcu(p, &kmmio_probes, list) { 90 - if (addr >= p->addr && addr <= (p->addr + p->len)) 91 return p; 92 } 93 return NULL;
··· 87 { 88 struct kmmio_probe *p; 89 list_for_each_entry_rcu(p, &kmmio_probes, list) { 90 + if (addr >= p->addr && addr < (p->addr + p->len)) 91 return p; 92 } 93 return NULL;
+1
kernel/trace/trace.c
··· 3448 if (!ref) 3449 break; 3450 3451 ref->buffer = info->tr->buffer; 3452 ref->page = ring_buffer_alloc_read_page(ref->buffer); 3453 if (!ref->page) {
··· 3448 if (!ref) 3449 break; 3450 3451 + ref->ref = 1; 3452 ref->buffer = info->tr->buffer; 3453 ref->page = ring_buffer_alloc_read_page(ref->buffer); 3454 if (!ref->page) {