diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:11 +0100 |
| commit | 35239e23c66f1614c76739b62a299c3c92d6eb68 (patch) | |
| tree | 7b1e068df888ec9a00b43c1dd7517a6490da6a94 /arch/arm/include | |
| parent | 3f33ab1c0c741bfab2138c14ba1918a7905a1e8b (diff) | |
| parent | 87e24f4b67e68d9fd8df16e0bf9c66d1ad2a2533 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h index b5a5be2536c..90114faa9f3 100644 --- a/arch/arm/include/asm/pmu.h +++ b/arch/arm/include/asm/pmu.h @@ -134,7 +134,7 @@ int __init armpmu_register(struct arm_pmu *armpmu, char *name, int type); u64 armpmu_event_update(struct perf_event *event, struct hw_perf_event *hwc, - int idx, int overflow); + int idx); int armpmu_event_set_period(struct perf_event *event, struct hw_perf_event *hwc, |