summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-04-23 16:47:51 +0200
committerRobert Richter <robert.richter@amd.com>2010-04-23 16:47:51 +0200
commitb971f06187d83b5c03d2b597cccdfef421c0ca91 (patch)
tree849dbe485ca9472bea002f94681882ce103fe3cd /drivers/oprofile
parentcb6e943ccf19ab6d3189147e9d625a992e016084 (diff)
parentc1ab9cab75098924fa8226a8a371de66977439df (diff)
downloadlinux-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.gz
linux-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.bz2
linux-b971f06187d83b5c03d2b597cccdfef421c0ca91.zip
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')
-rw-r--r--drivers/oprofile/cpu_buffer.c2
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)
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;