tracing: Remove unused tracing option "ftrace_preempt"

[linux-2.6-block.git] / kernel / trace / trace.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 74bde81601a902759e5714b04a5a987ddbde2d15..19d5c411d4ecfaccad61c63475e18612d4c144ff 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -611,29 +611,12 @@ void update_max_tr_single(struct trace_array *tr,
 #endif /* CONFIG_TRACER_MAX_TRACE */
 
 #ifdef CONFIG_STACKTRACE
-void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags,
-                       int skip, int pc);
-
-void ftrace_trace_stack_regs(struct ring_buffer *buffer, unsigned long flags,
-                            int skip, int pc, struct pt_regs *regs);
-
 void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,
                            int pc);
 
 void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,
                   int pc);
 #else
-static inline void ftrace_trace_stack(struct ring_buffer *buffer,
-                                     unsigned long flags, int skip, int pc)
-{
-}
-
-static inline void ftrace_trace_stack_regs(struct ring_buffer *buffer,
-                                          unsigned long flags, int skip,
-                                          int pc, struct pt_regs *regs)
-{
-}
-
 static inline void ftrace_trace_userstack(struct ring_buffer *buffer,
                                          unsigned long flags, int pc)
 {
@@ -914,22 +897,22 @@ enum trace_iterator_flags {
        TRACE_ITER_BLOCK                = 0x80,
        TRACE_ITER_STACKTRACE           = 0x100,
        TRACE_ITER_PRINTK               = 0x200,
-       TRACE_ITER_PREEMPTONLY          = 0x400,
-       TRACE_ITER_BRANCH               = 0x800,
-       TRACE_ITER_ANNOTATE             = 0x1000,
-       TRACE_ITER_USERSTACKTRACE       = 0x2000,
-       TRACE_ITER_SYM_USEROBJ          = 0x4000,
-       TRACE_ITER_PRINTK_MSGONLY       = 0x8000,
-       TRACE_ITER_CONTEXT_INFO         = 0x10000, /* Print pid/cpu/time */
-       TRACE_ITER_LATENCY_FMT          = 0x20000,
-       TRACE_ITER_SLEEP_TIME           = 0x40000,
-       TRACE_ITER_GRAPH_TIME           = 0x80000,
-       TRACE_ITER_RECORD_CMD           = 0x100000,
-       TRACE_ITER_OVERWRITE            = 0x200000,
-       TRACE_ITER_STOP_ON_FREE         = 0x400000,
-       TRACE_ITER_IRQ_INFO             = 0x800000,
-       TRACE_ITER_MARKERS              = 0x1000000,
-       TRACE_ITER_FUNCTION             = 0x2000000,
+       TRACE_ITER_BRANCH               = 0x400,
+       TRACE_ITER_ANNOTATE             = 0x800,
+       TRACE_ITER_USERSTACKTRACE       = 0x1000,
+       TRACE_ITER_SYM_USEROBJ          = 0x2000,
+       TRACE_ITER_PRINTK_MSGONLY       = 0x4000,
+       TRACE_ITER_CONTEXT_INFO         = 0x8000, /* Print pid/cpu/time */
+       TRACE_ITER_LATENCY_FMT          = 0x10000,
+       TRACE_ITER_SLEEP_TIME           = 0x20000,
+       TRACE_ITER_GRAPH_TIME           = 0x40000,
+       TRACE_ITER_RECORD_CMD           = 0x80000,
+       TRACE_ITER_OVERWRITE            = 0x100000,
+       TRACE_ITER_STOP_ON_FREE         = 0x200000,
+       TRACE_ITER_IRQ_INFO             = 0x400000,
+       TRACE_ITER_MARKERS              = 0x800000,
+       TRACE_ITER_FUNCTION             = 0x1000000,
+       TRACE_ITER_DISPLAY_GRAPH        = 0x2000000,
 };
 
 /*