Commit a8941b0ed0f1e39a4d41560c3a2e7ee37d5b6e10
Exists in
master
and in
7 other branches
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
…nel/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()
Showing 2 changed files Side-by-side Diff
kernel/trace/ring_buffer.c
| ... | ... | @@ -1209,18 +1209,19 @@ |
| 1209 | 1209 | |
| 1210 | 1210 | for (i = 0; i < nr_pages; i++) { |
| 1211 | 1211 | if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages))) |
| 1212 | - return; | |
| 1212 | + goto out; | |
| 1213 | 1213 | p = cpu_buffer->pages->next; |
| 1214 | 1214 | bpage = list_entry(p, struct buffer_page, list); |
| 1215 | 1215 | list_del_init(&bpage->list); |
| 1216 | 1216 | free_buffer_page(bpage); |
| 1217 | 1217 | } |
| 1218 | 1218 | if (RB_WARN_ON(cpu_buffer, list_empty(cpu_buffer->pages))) |
| 1219 | - return; | |
| 1219 | + goto out; | |
| 1220 | 1220 | |
| 1221 | 1221 | rb_reset_cpu(cpu_buffer); |
| 1222 | 1222 | rb_check_pages(cpu_buffer); |
| 1223 | 1223 | |
| 1224 | +out: | |
| 1224 | 1225 | spin_unlock_irq(&cpu_buffer->reader_lock); |
| 1225 | 1226 | } |
| 1226 | 1227 | |
| ... | ... | @@ -1237,7 +1238,7 @@ |
| 1237 | 1238 | |
| 1238 | 1239 | for (i = 0; i < nr_pages; i++) { |
| 1239 | 1240 | if (RB_WARN_ON(cpu_buffer, list_empty(pages))) |
| 1240 | - return; | |
| 1241 | + goto out; | |
| 1241 | 1242 | p = pages->next; |
| 1242 | 1243 | bpage = list_entry(p, struct buffer_page, list); |
| 1243 | 1244 | list_del_init(&bpage->list); |
| ... | ... | @@ -1246,6 +1247,7 @@ |
| 1246 | 1247 | rb_reset_cpu(cpu_buffer); |
| 1247 | 1248 | rb_check_pages(cpu_buffer); |
| 1248 | 1249 | |
| 1250 | +out: | |
| 1249 | 1251 | spin_unlock_irq(&cpu_buffer->reader_lock); |
| 1250 | 1252 | } |
| 1251 | 1253 |
kernel/trace/trace_clock.c
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 | int this_cpu; |
| 85 | 85 | u64 now; |
| 86 | 86 | |
| 87 | - raw_local_irq_save(flags); | |
| 87 | + local_irq_save(flags); | |
| 88 | 88 | |
| 89 | 89 | this_cpu = raw_smp_processor_id(); |
| 90 | 90 | now = cpu_clock(this_cpu); |
| ... | ... | @@ -110,7 +110,7 @@ |
| 110 | 110 | arch_spin_unlock(&trace_clock_struct.lock); |
| 111 | 111 | |
| 112 | 112 | out: |
| 113 | - raw_local_irq_restore(flags); | |
| 113 | + local_irq_restore(flags); | |
| 114 | 114 | |
| 115 | 115 | return now; |
| 116 | 116 | } |