KSYM_SYMBOL_LEN fixes

[linux-2.6-omap-h63xx.git] / include / linux / ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ac58e94668b7cb7fbd47f5013992c3ddc040fb0a..9c5bc6be2b091274b37b14046f03ebf3db70c194 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -6,6 +6,7 @@
 #include <linux/ktime.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <linux/kallsyms.h>
 
 #ifdef CONFIG_FUNCTION_TRACER
@@ -44,8 +45,6 @@ static inline void ftrace_kill(void) { }
 #endif /* CONFIG_FUNCTION_TRACER */
 
 #ifdef CONFIG_DYNAMIC_FTRACE
-# define FTRACE_HASHBITS       10
-# define FTRACE_HASHSIZE       (1<<FTRACE_HASHBITS)
 
 enum {
        FTRACE_FL_FREE          = (1 << 0),
@@ -58,9 +57,9 @@ enum {
 };
 
 struct dyn_ftrace {
-       struct hlist_node node;
-       unsigned long     ip; /* address of mcount call-site */
-       unsigned long     flags;
+       struct list_head        list;
+       unsigned long           ip; /* address of mcount call-site */
+       unsigned long           flags;
 };
 
 int ftrace_force_update(void);
@@ -71,7 +70,6 @@ extern int ftrace_ip_converted(unsigned long ip);
 extern unsigned char *ftrace_nop_replace(void);
 extern unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr);
 extern int ftrace_dyn_arch_init(void *data);
-extern int ftrace_mcount_set(unsigned long *data);
 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
@@ -234,7 +232,7 @@ ftrace_init_module(unsigned long *start, unsigned long *end) { }
 
 struct boot_trace {
        pid_t                   caller;
-       char                    func[KSYM_NAME_LEN];
+       char                    func[KSYM_SYMBOL_LEN];
        int                     result;
        unsigned long long      duration;               /* usecs */
        ktime_t                 calltime;