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

Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse Source
This commit is contained in:
Ingo Molnar
2009-02-13 10:26:45 +01:00
parent 1c511f740f 45141d4667
commit d351c8db95
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/ring_buffer.c
View File

@@ -1017,7 +1017,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
*/ */
if (unlikely(in_nmi())) { if (unlikely(in_nmi())) {
if (!__raw_spin_trylock(&cpu_buffer->lock)) if (!__raw_spin_trylock(&cpu_buffer->lock))
goto out_unlock; goto out_reset;
} else } else
__raw_spin_lock(&cpu_buffer->lock); __raw_spin_lock(&cpu_buffer->lock);
@@ -1030,7 +1030,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
/* we grabbed the lock before incrementing */ /* we grabbed the lock before incrementing */
if (RB_WARN_ON(cpu_buffer, next_page == reader_page)) if (RB_WARN_ON(cpu_buffer, next_page == reader_page))
goto out_unlock; goto out_reset;
/* /*
* If for some reason, we had an interrupt storm that made * If for some reason, we had an interrupt storm that made
@@ -1039,12 +1039,12 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
*/ */
if (unlikely(next_page == commit_page)) { if (unlikely(next_page == commit_page)) {
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
goto out_unlock; goto out_reset;
} }
if (next_page == head_page) { if (next_page == head_page) {
if (!(buffer->flags & RB_FL_OVERWRITE)) if (!(buffer->flags & RB_FL_OVERWRITE))
goto out_unlock; goto out_reset;
/* tail_page has not moved yet? */ /* tail_page has not moved yet? */
if (tail_page == cpu_buffer->tail_page) { if (tail_page == cpu_buffer->tail_page) {
@@ -1118,7 +1118,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
return event; return event;
out_unlock: out_reset:
/* reset write */ /* reset write */
if (tail <= BUF_PAGE_SIZE) if (tail <= BUF_PAGE_SIZE)
local_set(&tail_page->write, tail); local_set(&tail_page->write, tail);