diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-27 06:07:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-27 06:08:09 -0500 |
| commit | 44a683971119bafb5bc30778f92ee773680ebb6f (patch) | |
| tree | 58648459f29d45c447bd2352e81844d4d9aa3a15 /arch/arm | |
| parent | 801493c2e249a7314e9e8e54ad60d613d0a86f14 (diff) | |
| parent | 08aa0d1f376e9b966568316bd2019b3c1274d885 (diff) | |
Merge branch 'perf/fast' into perf/core
Merge reason: Lets ready it for v3.4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/perf_event.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h index 99cfe3607989..7523340afb8a 100644 --- a/arch/arm/include/asm/perf_event.h +++ b/arch/arm/include/asm/perf_event.h | |||
| @@ -12,10 +12,6 @@ | |||
| 12 | #ifndef __ARM_PERF_EVENT_H__ | 12 | #ifndef __ARM_PERF_EVENT_H__ |
| 13 | #define __ARM_PERF_EVENT_H__ | 13 | #define __ARM_PERF_EVENT_H__ |
| 14 | 14 | ||
| 15 | /* ARM performance counters start from 1 (in the cp15 accesses) so use the | ||
| 16 | * same indexes here for consistency. */ | ||
| 17 | #define PERF_EVENT_INDEX_OFFSET 1 | ||
| 18 | |||
| 19 | /* ARM perf PMU IDs for use by internal perf clients. */ | 15 | /* ARM perf PMU IDs for use by internal perf clients. */ |
| 20 | enum arm_perf_pmu_ids { | 16 | enum arm_perf_pmu_ids { |
| 21 | ARM_PERF_PMU_ID_XSCALE1 = 0, | 17 | ARM_PERF_PMU_ID_XSCALE1 = 0, |