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-31 04:01:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'tip/perf/core' into oprofile/core

Browse source 
Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c
This commit is contained in:
Robert Richter 2010-10-15 12:45:00 +02:00
commit 6268464b37
463 changed files with 8441 additions and 3910 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/oprofile/oprofile_perf.c
View file

@ -77,7 +77,7 @@ static int op_create_counter(int cpu, int event)
return 0;
pevent = perf_event_create_kernel_counter(&counter_config[event].attr,
cpu, -1,
cpu, NULL,
op_overflow_handler);
if (IS_ERR(pevent))