aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 9635aa2c4fc1..dccae6312941 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -468,7 +468,7 @@ enum trace_iterator_flags {
468 TRACE_ITER_SCHED_TREE = 0x200, 468 TRACE_ITER_SCHED_TREE = 0x200,
469 TRACE_ITER_PRINTK = 0x400, 469 TRACE_ITER_PRINTK = 0x400,
470 TRACE_ITER_PREEMPTONLY = 0x800, 470 TRACE_ITER_PREEMPTONLY = 0x800,
471#ifdef CONFIG_UNLIKELY_TRACER 471#ifdef CONFIG_BRANCH_TRACER
472 TRACE_ITER_UNLIKELY = 0x1000, 472 TRACE_ITER_UNLIKELY = 0x1000,
473#endif 473#endif
474}; 474};
@@ -530,7 +530,7 @@ static inline void ftrace_preempt_enable(int resched)
530 preempt_enable_notrace(); 530 preempt_enable_notrace();
531} 531}
532 532
533#ifdef CONFIG_UNLIKELY_TRACER 533#ifdef CONFIG_BRANCH_TRACER
534extern int enable_unlikely_tracing(struct trace_array *tr); 534extern int enable_unlikely_tracing(struct trace_array *tr);
535extern void disable_unlikely_tracing(void); 535extern void disable_unlikely_tracing(void);
536static inline int trace_unlikely_enable(struct trace_array *tr) 536static inline int trace_unlikely_enable(struct trace_array *tr)
@@ -552,6 +552,6 @@ static inline int trace_unlikely_enable(struct trace_array *tr)
552static inline void trace_unlikely_disable(void) 552static inline void trace_unlikely_disable(void)
553{ 553{
554} 554}
555#endif /* CONFIG_UNLIKELY_TRACER */ 555#endif /* CONFIG_BRANCH_TRACER */
556 556
557#endif /* _LINUX_KERNEL_TRACE_H */ 557#endif /* _LINUX_KERNEL_TRACE_H */