From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Patch "ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section" has been added to the 3.0-stable tree To: lizefan@huawei.com, fweisbec@gmail.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, rostedt@goodmis.org, stable@vger.kernel.org Cc: , From: Date: Mon, 10 Jun 2013 14:28:01 -0700 In-Reply-To: <51B1A150.6030804@huawei.com> Message-ID: <13708996812812@kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section to the 3.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch and it can be found in the queue-3.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From lizefan@huawei.com Mon Jun 10 14:16:48 2013 From: Li Zefan Date: Fri, 7 Jun 2013 17:01:04 +0800 Subject: ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section To: Greg Kroah-Hartman Cc: Namhyung Kim , Frederic Weisbecker , Steven Rostedt , Ingo Molnar , LKML , stable Message-ID: <51B1A150.6030804@huawei.com> From: Steven Rostedt 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 Cc: Namhyung Kim [ lizf: adjust context ] Signed-off-by: Li Zefan Signed-off-by: Greg Kroah-Hartman --- kernel/trace/ftrace.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -933,6 +933,19 @@ static __init void ftrace_profile_debugf static struct pid * const ftrace_swapper_pid = &init_struct_pid; +static loff_t +ftrace_filter_lseek(struct file *file, loff_t offset, int whence) +{ + loff_t ret; + + if (file->f_mode & FMODE_READ) + ret = seq_lseek(file, offset, whence); + else + file->f_pos = ret = 1; + + return ret; +} + #ifdef CONFIG_DYNAMIC_FTRACE #ifndef CONFIG_FTRACE_MCOUNT_RECORD @@ -2299,19 +2312,6 @@ ftrace_notrace_open(struct inode *inode, inode, file); } -static loff_t -ftrace_filter_lseek(struct file *file, loff_t offset, int origin) -{ - loff_t ret; - - if (file->f_mode & FMODE_READ) - ret = seq_lseek(file, offset, origin); - else - file->f_pos = ret = 1; - - return ret; -} - static int ftrace_match(char *str, char *regex, int len, int type) { int matched = 0; Patches currently in stable-queue which might be from lizefan@huawei.com are queue-3.0/tracing-fix-possible-null-pointer-dereferences.patch queue-3.0/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch