tracing fixes
Subsystems (2)
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
------------------>
Julia Lawall (1):
ring-buffer: Add missing unlock
Li Zefan (1):
tracing: Fix lockdep warning in global_clock()
kernel/trace/ring_buffer.c | 8 +++++--- kernel/trace/trace_clock.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-)
kernel/trace/ring_buffer.c +5 -3
@@ -1209,18 +1209,19 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)for (i =0 ; i < nr_pages; i++) {if (RB_WARN_ON (cpu_buffer,list_empty (cpu_buffer->pages))) -return ; + goto out; p = cpu_buffer->pages->next; bpage = list_entry(p, struct buffer_page, list);list_del_init (&bpage->list);free_buffer_page (bpage); }if (RB_WARN_ON (cpu_buffer,list_empty (cpu_buffer->pages))) -return ; + goto out;rb_reset_cpu (cpu_buffer);rb_check_pages (cpu_buffer); +out: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++) {if (RB_WARN_ON (cpu_buffer,list_empty (pages))) -return ; + goto out; p = pages->next; bpage = list_entry(p, struct buffer_page, 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_check_pages (cpu_buffer); +out:spin_unlock_irq (&cpu_buffer->reader_lock); }
kernel/trace/trace_clock.c +2 -2
@@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void)int this_cpu;u64 now; -raw_local_irq_save (flags); +local_irq_save (flags); this_cpu =raw_smp_processor_id (); now =cpu_clock (this_cpu);
@@ -110,7 +110,7 @@ u64 notrace trace_clock_global(void)arch_spin_unlock (&trace_clock_struct.lock); out: -raw_local_irq_restore (flags); +local_irq_restore (flags);return now; }