diff options
author | Robert Richter <robert.richter@amd.com> | 2010-04-23 10:47:51 -0400 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 10:47:51 -0400 |
commit | b971f06187d83b5c03d2b597cccdfef421c0ca91 (patch) | |
tree | 849dbe485ca9472bea002f94681882ce103fe3cd /drivers/oprofile/cpu_buffer.c | |
parent | cb6e943ccf19ab6d3189147e9d625a992e016084 (diff) | |
parent | c1ab9cab75098924fa8226a8a371de66977439df (diff) |
Merge commit 'tip/tracing/core' into oprofile/core
Conflicts:
drivers/oprofile/cpu_buffer.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
-rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index de82183bb9b3..0ac8b065ee02 100644 --- 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) | |||
159 | struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu) | 159 | struct op_sample *op_cpu_buffer_read_entry(struct op_entry *entry, int cpu) |
160 | { | 160 | { |
161 | struct ring_buffer_event *e; | 161 | struct ring_buffer_event *e; |
162 | e = ring_buffer_consume(op_ring_buffer, cpu, NULL); | 162 | e = ring_buffer_consume(op_ring_buffer, cpu, NULL, NULL); |
163 | if (!e) | 163 | if (!e) |
164 | return NULL; | 164 | return NULL; |
165 | 165 | ||