diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-17 06:55:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-17 06:55:07 -0500 |
| commit | 09bda4432a8a4d4db2b2b94697abc8d732a9ff73 (patch) | |
| tree | 8449aac6af302967dcbabdfb315bf691491a4241 /include/linux/ftrace.h | |
| parent | d1e169da9e20efc0762da6ec160dd7740d0103f5 (diff) | |
| parent | 47b0edcb599ea6eb9ef16d3a08932a0e01485293 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'include/linux/ftrace.h')
| -rw-r--r-- | include/linux/ftrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 028e26f0bf08..f33fb3b041c6 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -178,9 +178,9 @@ struct dyn_ftrace { | |||
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | int ftrace_force_update(void); | 180 | int ftrace_force_update(void); |
| 181 | void ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf, | 181 | int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf, |
| 182 | int len, int reset); | 182 | int len, int reset); |
| 183 | void ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf, | 183 | int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf, |
| 184 | int len, int reset); | 184 | int len, int reset); |
| 185 | void ftrace_set_global_filter(unsigned char *buf, int len, int reset); | 185 | void ftrace_set_global_filter(unsigned char *buf, int len, int reset); |
| 186 | void ftrace_set_global_notrace(unsigned char *buf, int len, int reset); | 186 | void ftrace_set_global_notrace(unsigned char *buf, int len, int reset); |