| commit | 6268464b370e234e0255330190f9bd5d19386ad7 | [log] [tgz] |
|---|---|---|
| author | Robert Richter <robert.richter@amd.com> | Fri Oct 15 12:45:00 2010 +0200 |
| committer | Robert Richter <robert.richter@amd.com> | Fri Oct 15 12:45:00 2010 +0200 |
| tree | 5742641092ce64227dd2086d78baaede57da1f80 | |
| parent | 7df01d96b295e400167e78061b81d4c91630b12d [diff] [blame] | |
| parent | 0fdf13606b67f830559abdaad15980c7f4f05ec4 [diff] [blame] |
Merge remote branch 'tip/perf/core' into oprofile/core Conflicts: arch/arm/oprofile/common.c kernel/perf_event.c
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index b17235a..79c0005 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c
@@ -77,7 +77,7 @@ return 0; pevent = perf_event_create_kernel_counter(&counter_config[event].attr, - cpu, -1, + cpu, NULL, op_overflow_handler); if (IS_ERR(pevent))