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 commit 'tip/tracing/core' into oprofile/core
[safe/jmp/linux-2.6]
/
drivers
/
oprofile
/
cpu_buffer.c
diff --git
a/drivers/oprofile/cpu_buffer.c
b/drivers/oprofile/cpu_buffer.c
index
de82183
..
0ac8b06
100644
(file)
--- a/
drivers/oprofile/cpu_buffer.c
+++ b/
drivers/oprofile/cpu_buffer.c
@@
-159,7
+159,7
@@
int op_cpu_buffer_write_commit(struct op_entry *entry)
struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu)
{
struct ring_buffer_event *e;
- e = ring_buffer_consume(op_ring_buffer, cpu, NULL);
+ e = ring_buffer_consume(op_ring_buffer, cpu, NULL
, NULL
);
if (!e)
return NULL;