PNP: define PNP-specific IORESOURCE_IO_* flags alongside IRQ, DMA, MEM

[safe/jmp/linux-2.6] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 0d3714e..f368d04 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -4,6 +4,7 @@
 #ifdef CONFIG_FTRACE
 
 #include <linux/linkage.h>
+#include <linux/fs.h>
 
 extern int ftrace_enabled;
 extern int
@@ -30,7 +31,6 @@ int unregister_ftrace_function(struct ftrace_ops *ops);
 void clear_ftrace_function(void);
 
 extern void ftrace_stub(unsigned long a0, unsigned long a1);
-extern void mcount(void);
 
 #else /* !CONFIG_FTRACE */
 # define register_ftrace_function(ops) do { } while (0)
@@ -47,11 +47,14 @@ enum {
        FTRACE_FL_FAILED        = (1 << 1),
        FTRACE_FL_FILTER        = (1 << 2),
        FTRACE_FL_ENABLED       = (1 << 3),
+       FTRACE_FL_NOTRACE       = (1 << 4),
+       FTRACE_FL_CONVERTED     = (1 << 5),
+       FTRACE_FL_FROZEN        = (1 << 6),
 };
 
 struct dyn_ftrace {
        struct hlist_node node;
-       unsigned long     ip;
+       unsigned long     ip; /* address of mcount call-site */
        unsigned long     flags;
 };
 
@@ -70,13 +73,23 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
+
+extern int skip_trace(unsigned long ip);
+
+void ftrace_disable_daemon(void);
+void ftrace_enable_daemon(void);
+
 #else
+# define skip_trace(ip)                                ({ 0; })
 # define ftrace_force_update()                 ({ 0; })
 # define ftrace_set_filter(buf, len, reset)    do { } while (0)
-#endif
+# define ftrace_disable_daemon()               do { } while (0)
+# define ftrace_enable_daemon()                        do { } while (0)
+#endif /* CONFIG_DYNAMIC_FTRACE */
 
 /* totally disable ftrace - can not re-enable after this */
 void ftrace_kill(void);
+void ftrace_kill_atomic(void);
 
 static inline void tracer_disable(void)
 {
@@ -105,19 +118,27 @@ static inline void tracer_disable(void)
 #endif
 
 #ifdef CONFIG_IRQSOFF_TRACER
-  extern void notrace time_hardirqs_on(unsigned long a0, unsigned long a1);
-  extern void notrace time_hardirqs_off(unsigned long a0, unsigned long a1);
+  extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
+  extern void time_hardirqs_off(unsigned long a0, unsigned long a1);
 #else
 # define time_hardirqs_on(a0, a1)              do { } while (0)
 # define time_hardirqs_off(a0, a1)             do { } while (0)
 #endif
 
 #ifdef CONFIG_PREEMPT_TRACER
-  extern void notrace trace_preempt_on(unsigned long a0, unsigned long a1);
-  extern void notrace trace_preempt_off(unsigned long a0, unsigned long a1);
+  extern void trace_preempt_on(unsigned long a0, unsigned long a1);
+  extern void trace_preempt_off(unsigned long a0, unsigned long a1);
 #else
 # define trace_preempt_on(a0, a1)              do { } while (0)
 # define trace_preempt_off(a0, a1)             do { } while (0)
 #endif
 
+#ifdef CONFIG_TRACING
+extern void
+ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
+#else
+static inline void
+ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
+#endif
+
 #endif /* _LINUX_FTRACE_H */