---

yaml --- r: 298308 b: refs/heads/master c: fa73dc9 h: refs/heads/master v: v3
git-mirror · Mar 13, 2012 · 158562a · 158562a
1 parent c4050a2
commit 158562a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db6544e0075d192e5ad16eda8689c55fa9c6f8f4
+refs/heads/master: fa73dc9400516945bcbae8d98c23393bcefe1440
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
@@ -836,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[];
 		     filter)
 #include "trace_entries.h"
 
-#ifdef CONFIG_PERF_EVENTS
 #ifdef CONFIG_FUNCTION_TRACER
 int perf_ftrace_event_register(struct ftrace_event_call *call,
 			       enum trace_reg type, void *data);
 #else
 #define perf_ftrace_event_register NULL
 #endif /* CONFIG_FUNCTION_TRACER */
-#endif /* CONFIG_PERF_EVENTS */
 
 #endif /* _LINUX_KERNEL_TRACE_H */