diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /kernel/trace/trace_functions.c | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
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 8d0e1cc4e97..c7b0c6a7db0 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; |