diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:47:51 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-04-23 16:47:51 +0200 |
| commit | b971f06187d83b5c03d2b597cccdfef421c0ca91 (patch) | |
| tree | 849dbe485ca9472bea002f94681882ce103fe3cd /drivers/oprofile | |
| parent | cb6e943ccf19ab6d3189147e9d625a992e016084 (diff) | |
| parent | c1ab9cab75098924fa8226a8a371de66977439df (diff) | |
| download | kernel_samsung_crespo-b971f06187d83b5c03d2b597cccdfef421c0ca91.zip kernel_samsung_crespo-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.gz kernel_samsung_crespo-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index de82183..0ac8b06 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; |