diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 09:29:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 09:29:21 +0200 |
| commit | 492f73a303b488ffd67097b2351d54aa6e6c7c73 (patch) | |
| tree | 6e6c16fbd628bb5eb577cfc70a488ca286563e58 /include | |
| parent | tracing, x86/irq: Do not trace arch_local_{*,irq_*}() functions (diff) | |
| parent | ftrace: Fix regression where ftrace breaks when modules are loaded (diff) | |
| download | linux-492f73a303b488ffd67097b2351d54aa6e6c7c73.tar.xz linux-492f73a303b488ffd67097b2351d54aa6e6c7c73.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: pick up the latest fixes - they won't make v3.0.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 9d88e1cb5dbb..f0c0e8a47ae6 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -19,6 +19,8 @@ #include <asm/ftrace.h> +struct ftrace_hash; + #ifdef CONFIG_FUNCTION_TRACER extern int ftrace_enabled; @@ -29,8 +31,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip); -struct ftrace_hash; - enum { FTRACE_OPS_FL_ENABLED = 1 << 0, FTRACE_OPS_FL_GLOBAL = 1 << 1, @@ -123,7 +123,8 @@ stack_trace_sysctl(struct ctl_table *table, int write, struct ftrace_func_command { struct list_head list; char *name; - int (*func)(char *func, char *cmd, + int (*func)(struct ftrace_hash *hash, + char *func, char *cmd, char *params, int enable); }; |