aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat)2013-04-12 15:40:13 -0500
committerGreg Kroah-Hartman2013-04-16 23:48:29 -0500
commit103d7cb05682db5a57e40b96f2029be91171c112 (patch)
tree0ca4277a51c55663381cbdd78269849a6a6bf91c /include
parent69bcccfef278d0b58b684fbd3ead0c52e4384d53 (diff)
downloadkernel-omap-103d7cb05682db5a57e40b96f2029be91171c112.tar.gz
kernel-omap-103d7cb05682db5a57e40b96f2029be91171c112.tar.xz
kernel-omap-103d7cb05682db5a57e40b96f2029be91171c112.zip
ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
commit 7f49ef69db6bbf756c0abca7e9b65b32e999eec8 upstream. As ftrace_filter_lseek is now used with ftrace_pid_fops, it needs to be moved out of the #ifdef CONFIG_DYNAMIC_FTRACE section as the ftrace_pid_fops is defined when DYNAMIC_FTRACE is not. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 300fa8a32cf7..616603da011b 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -394,7 +394,6 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf,
394 size_t cnt, loff_t *ppos); 394 size_t cnt, loff_t *ppos);
395ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, 395ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf,
396 size_t cnt, loff_t *ppos); 396 size_t cnt, loff_t *ppos);
397loff_t ftrace_filter_lseek(struct file *file, loff_t offset, int whence);
398int ftrace_regex_release(struct inode *inode, struct file *file); 397int ftrace_regex_release(struct inode *inode, struct file *file);
399 398
400void __init 399void __init
@@ -567,6 +566,8 @@ static inline int
567ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; } 566ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; }
568#endif /* CONFIG_DYNAMIC_FTRACE */ 567#endif /* CONFIG_DYNAMIC_FTRACE */
569 568
569loff_t ftrace_filter_lseek(struct file *file, loff_t offset, int whence);
570
570/* totally disable ftrace - can not re-enable after this */ 571/* totally disable ftrace - can not re-enable after this */
571void ftrace_kill(void); 572void ftrace_kill(void);
572 573