lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-05-05 12:08:02 -07:00
parent 5e30302b9e 33015c8599
commit e91b3b2681
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/kmmio.c
View File

@@ -87,7 +87,7 @@ static struct kmmio_probe *get_kmmio_probe(unsigned long addr)
{ {
struct kmmio_probe *p; struct kmmio_probe *p;
list_for_each_entry_rcu(p, &kmmio_probes, list) { 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 p;
} }
return NULL; return NULL;

1
kernel/trace/trace.c
View File

@@ -3448,6 +3448,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
if (!ref) if (!ref)
break; break;
ref->ref = 1;
ref->buffer = info->tr->buffer; ref->buffer = info->tr->buffer;
ref->page = ring_buffer_alloc_read_page(ref->buffer); ref->page = ring_buffer_alloc_read_page(ref->buffer);
if (!ref->page) { if (!ref->page) {