Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e91b3b26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

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
parents 5e30302b 33015c85

arch/x86/mm/kmmio.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) {