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

Commit a8941b0e 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:
  ring-buffer: Add missing unlock
  tracing: Fix lockdep warning in global_clock()
parents d82ef020 292f60c0

kernel/trace/ring_buffer.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -1209,18 +1209,19 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages) 




	for (i = 0; i < nr_pages; i++) {

	for (i = 0; i < nr_pages; i++) {

		if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))

		if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))

			return;

			goto out;

		p = cpu_buffer->pages->next;

		p = cpu_buffer->pages->next;

		bpage = list_entry(p, struct buffer_page, list);

		bpage = list_entry(p, struct buffer_page, list);

		list_del_init(&bpage->list);

		list_del_init(&bpage->list);

		free_buffer_page(bpage);

		free_buffer_page(bpage);

	}

	}

	if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))

	if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages)))

		return;

		goto out;





	rb_reset_cpu(cpu_buffer);

	rb_reset_cpu(cpu_buffer);

	rb_check_pages(cpu_buffer);

	rb_check_pages(cpu_buffer);





out:

	spin_unlock_irq(&cpu_buffer->reader_lock);

	spin_unlock_irq(&cpu_buffer->reader_lock);

}

}
@@ -1237,7 +1238,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer, 




	for (i = 0; i < nr_pages; i++) {

	for (i = 0; i < nr_pages; i++) {

		if (RB_WARN_ON(cpu_buffer, list_empty(pages)))

		if (RB_WARN_ON(cpu_buffer, list_empty(pages)))

			return;

			goto out;

		p = pages->next;

		p = pages->next;

		bpage = list_entry(p, struct buffer_page, list);

		bpage = list_entry(p, struct buffer_page, list);

		list_del_init(&bpage->list);

		list_del_init(&bpage->list);
@@ -1246,6 +1247,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer, 
	rb_reset_cpu(cpu_buffer);

	rb_reset_cpu(cpu_buffer);

	rb_check_pages(cpu_buffer);

	rb_check_pages(cpu_buffer);





out:

	spin_unlock_irq(&cpu_buffer->reader_lock);

	spin_unlock_irq(&cpu_buffer->reader_lock);

}

}

kernel/trace/trace_clock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void) 
	int this_cpu;

	int this_cpu;

	u64 now;

	u64 now;





	raw_local_irq_save(flags);

	local_irq_save(flags);





	this_cpu = raw_smp_processor_id();

	this_cpu = raw_smp_processor_id();

	now = cpu_clock(this_cpu);

	now = cpu_clock(this_cpu);
@@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void) 
	arch_spin_unlock(&trace_clock_struct.lock);

	arch_spin_unlock(&trace_clock_struct.lock);





 out:

 out:

	raw_local_irq_restore(flags);

	local_irq_restore(flags);





	return now;

	return now;

}
 
}