summaryrefslogtreecommitdiff
path: root/arch/s390
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/s390
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/s390')
-rw-r--r--arch/s390/include/asm/perf_event.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
index a75f168d2718..4eb444edbe49 100644
--- a/arch/s390/include/asm/perf_event.h
+++ b/arch/s390/include/asm/perf_event.h
@@ -6,4 +6,3 @@
/* Empty, just to avoid compiling error */
-#define PERF_EVENT_INDEX_OFFSET 0