On Fri, 2013-06-07 at 17:02 +0800, Li Zefan wrote:
> This is a leftover after ftrace_regex_lseek() was renamed to
> ftrace_filter_lseek() and then ftrace_filter_lseek() was moved
> out side of CONFIG_DYNAMIC_FTRACE.
> 
> Signed-off-by: Li Zefan <lize...@huawei.com>

Thanks! I queued this up for 3.11, as it's not important enough for a
later -rc release.

-- Steve

> ---
>  include/linux/ftrace.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index 99d0fbc..e48ed1d 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -566,10 +566,6 @@ static inline ssize_t ftrace_filter_write(struct file 
> *file, const char __user *
>                           size_t cnt, loff_t *ppos) { return -ENODEV; }
>  static inline ssize_t ftrace_notrace_write(struct file *file, const char 
> __user *ubuf,
>                            size_t cnt, loff_t *ppos) { return -ENODEV; }
> -static inline loff_t ftrace_regex_lseek(struct file *file, loff_t offset, 
> int whence)
> -{
> -     return -ENODEV;
> -}
>  static inline int
>  ftrace_regex_release(struct inode *inode, struct file *file) { return 
> -ENODEV; }
>  #endif /* CONFIG_DYNAMIC_FTRACE */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to