git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into tracing/core
[safe/jmp/linux-2.6]
/
kernel
/
trace
/
trace_selftest.c
diff --git
a/kernel/trace/trace_selftest.c
b/kernel/trace/trace_selftest.c
index
81003b4
..
9398034
100644
(file)
--- a/
kernel/trace/trace_selftest.c
+++ b/
kernel/trace/trace_selftest.c
@@
-30,7
+30,7
@@
static int trace_test_buffer_cpu(struct trace_array *tr, int cpu)
struct trace_entry *entry;
unsigned int loops = 0;
- while ((event = ring_buffer_consume(tr->buffer, cpu, NULL))) {
+ while ((event = ring_buffer_consume(tr->buffer, cpu, NULL
, NULL
))) {
entry = ring_buffer_event_data(event);
/*