---

yaml --- r: 298309 b: refs/heads/master c: 37d7399 h: refs/heads/master i: 298307: c4050a2 v: v3
git-mirror · Mar 14, 2012 · 8593ac2 · 8593ac2
1 parent 158562a
commit 8593ac2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;