public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ftrace: Remove ftrace_regex_lseek()
@ 2013-06-07  9:02 Li Zefan
  2013-06-07 19:50 ` Steven Rostedt
  0 siblings, 1 reply; 2+ messages in thread
From: Li Zefan @ 2013-06-07  9:02 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: Frederic Weisbecker, LKML

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 <lizefan@huawei.com>
---
 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 */
-- 
1.8.0.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ftrace: Remove ftrace_regex_lseek()
  2013-06-07  9:02 [PATCH] ftrace: Remove ftrace_regex_lseek() Li Zefan
@ 2013-06-07 19:50 ` Steven Rostedt
  0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2013-06-07 19:50 UTC (permalink / raw)
  To: Li Zefan; +Cc: Frederic Weisbecker, LKML

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 <lizefan@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 */



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-06-07 19:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-07  9:02 [PATCH] ftrace: Remove ftrace_regex_lseek() Li Zefan
2013-06-07 19:50 ` Steven Rostedt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox