Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

2008-11-18 08:52:13 +01:00
parent 3f8e402f34 0c726da983 e270219f43
commit 5a209c2d58
3 changed files with 1 additions and 5 deletions
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -471,9 +471,7 @@ enum trace_iterator_flags {
 	TRACE_ITER_SCHED_TREE		= 0x200,
 	TRACE_ITER_PRINTK		= 0x400,
 	TRACE_ITER_PREEMPTONLY		= 0x800,
-#ifdef CONFIG_BRANCH_TRACER
 	TRACE_ITER_BRANCH		= 0x1000,
-#endif
 	TRACE_ITER_ANNOTATE		= 0x2000,
 };