A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'tip/tracing/core' into oprofile/core

Browse source 
Conflicts:
	drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <[email protected]>
This commit is contained in:
Robert Richter 2010-04-23 16:47:51 +02:00
commit b971f06187
13 changed files with 186 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/oprofile/cpu_buffer.c
View file

@ -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;