diff --git a/[refs] b/[refs] index 3005d1187c53..d4f7387b7dfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38b78eb855409a05f9d370228bec1955e6878e08 +refs/heads/master: 96de37b62ca525cd77d2e85aea1472846ee31c4d diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h index 41df6f501656..028e26f0bf08 100644 --- a/trunk/include/linux/ftrace.h +++ b/trunk/include/linux/ftrace.h @@ -339,6 +339,7 @@ static inline int ftrace_text_reserved(void *start, void *end) * functions may still be called. Use a macro instead of inline. */ #define ftrace_regex_open(ops, flag, inod, file) ({ -ENODEV; }) +#define ftrace_set_early_filter(ops, buf, enable) do { } while (0) static inline ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { return -ENODEV; }