diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-15 06:45:00 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-15 06:45:00 -0400 |
| commit | 6268464b370e234e0255330190f9bd5d19386ad7 (patch) | |
| tree | 5742641092ce64227dd2086d78baaede57da1f80 /drivers/oprofile | |
| parent | 7df01d96b295e400167e78061b81d4c91630b12d (diff) | |
| parent | 0fdf13606b67f830559abdaad15980c7f4f05ec4 (diff) | |
Merge remote branch 'tip/perf/core' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/oprofile_perf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index b17235a24a4d..79c0005134a1 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c | |||
| @@ -77,7 +77,7 @@ static int op_create_counter(int cpu, int event) | |||
| 77 | return 0; | 77 | return 0; |
| 78 | 78 | ||
| 79 | pevent = perf_event_create_kernel_counter(&counter_config[event].attr, | 79 | pevent = perf_event_create_kernel_counter(&counter_config[event].attr, |
| 80 | cpu, -1, | 80 | cpu, NULL, |
| 81 | op_overflow_handler); | 81 | op_overflow_handler); |
| 82 | 82 | ||
| 83 | if (IS_ERR(pevent)) | 83 | if (IS_ERR(pevent)) |