From 8593ac281ccb7fa5a20d2447ce49ced4b4aa57e0 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Wed, 14 Mar 2012 00:03:02 +0100
Subject: [PATCH] --- yaml --- r: 298309 b: refs/heads/master c:
 37d73998920859784e6504462a2fd5f52cc08051 h: refs/heads/master i:   298307:
 c4050a2087446c61365734cd54cc6cc11d7805ab v: v3

---
 [refs]                             | 2 +-
 trunk/include/linux/ftrace_event.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf54813c01f5..66df6c010d60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa73dc9400516945bcbae8d98c23393bcefe1440
+refs/heads/master: 37d73998920859784e6504462a2fd5f52cc08051
diff --git a/trunk/include/linux/ftrace_event.h b/trunk/include/linux/ftrace_event.h
index dd478fc8f9f5..5f3f3be5af09 100644
--- a/trunk/include/linux/ftrace_event.h
+++ b/trunk/include/linux/ftrace_event.h
@@ -144,12 +144,14 @@ struct event_filter;
 enum trace_reg {
 	TRACE_REG_REGISTER,
 	TRACE_REG_UNREGISTER,
+#ifdef CONFIG_PERF_EVENTS
 	TRACE_REG_PERF_REGISTER,
 	TRACE_REG_PERF_UNREGISTER,
 	TRACE_REG_PERF_OPEN,
 	TRACE_REG_PERF_CLOSE,
 	TRACE_REG_PERF_ADD,
 	TRACE_REG_PERF_DEL,
+#endif
 };
 
 struct ftrace_event_call;