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 /kernel/trace/trace_functions.c | |
| parent | e08fbb78f03fe2c4f88824faf6f51ce6af185e11 (diff) | |
| parent | f7bc8b61f65726ff98f52e286b28e294499d7a08 (diff) | |
| download | linux-492f73a303b488ffd67097b2351d54aa6e6c7c73.tar.gz | |
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 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 8d0e1cc4e974..c7b0c6a7db09 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -324,7 +324,8 @@ ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param) } static int -ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable) +ftrace_trace_onoff_callback(struct ftrace_hash *hash, + char *glob, char *cmd, char *param, int enable) { struct ftrace_probe_ops *ops; void *count = (void *)-1; |