diff --git a/[refs] b/[refs] index 068a69266862..960f0e362497 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa18efb2a2f07e1cf062039848e9d369bb358724 +refs/heads/master: cb4764a6dbffd9bb3cf759421ae82384071a933d diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 98daf5dc74a6..672b195f86c9 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -1164,7 +1164,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip) entry->ip = ip; entry->parent_ip = parent_ip; - trace_current_buffer_unlock_commit(event, flags, pc); + trace_nowake_buffer_unlock_commit(event, flags, pc); out: atomic_dec(&per_cpu(test_event_disable, cpu));