summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/perf_event.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-01-27 15:07:57 +0400
committerIngo Molnar <mingo@elte.hu>2012-01-27 15:08:09 +0400
commit44a683971119bafb5bc30778f92ee773680ebb6f (patch)
tree58648459f29d45c447bd2352e81844d4d9aa3a15 /arch/arm/include/asm/perf_event.h
parent801493c2e249a7314e9e8e54ad60d613d0a86f14 (diff)
parent08aa0d1f376e9b966568316bd2019b3c1274d885 (diff)
downloadlinux-44a683971119bafb5bc30778f92ee773680ebb6f.tar.xz
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/include/asm/perf_event.h')
-rw-r--r--arch/arm/include/asm/perf_event.h4
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 @@
#ifndef __ARM_PERF_EVENT_H__
#define __ARM_PERF_EVENT_H__
-/* ARM performance counters start from 1 (in the cp15 accesses) so use the
- * same indexes here for consistency. */
-#define PERF_EVENT_INDEX_OFFSET 1
-
/* ARM perf PMU IDs for use by internal perf clients. */
enum arm_perf_pmu_ids {
ARM_PERF_PMU_ID_XSCALE1 = 0,