From 6f671deeae52556a13cb14e69e9e76c6beeb4676 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Mon, 17 Aug 2009 16:54:03 +0800
Subject: [PATCH] --- yaml --- r: 158441 b: refs/heads/master c:
 3be04b471b95b870bd129a138463756629e86f3f h: refs/heads/master i:   158439:
 be7eb643028ff028d543846f3ea1f88bed8ef4cf v: v3

---
 [refs]                      |  2 +-
 trunk/kernel/trace/ftrace.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 9e87d886cf3f..b04b32c07dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fc5f0cff4cf1c4cd336d0f61f11bca6eeee1d84
+refs/heads/master: 3be04b471b95b870bd129a138463756629e86f3f
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 094863416b2e..1993b7186cdb 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -1556,17 +1556,6 @@ ftrace_avail_open(struct inode *inode, struct file *file)
 	return ret;
 }
 
-int ftrace_avail_release(struct inode *inode, struct file *file)
-{
-	struct seq_file *m = (struct seq_file *)file->private_data;
-	struct ftrace_iterator *iter = m->private;
-
-	seq_release(inode, file);
-	kfree(iter);
-
-	return 0;
-}
-
 static int
 ftrace_failures_open(struct inode *inode, struct file *file)
 {
@@ -2427,14 +2416,14 @@ static const struct file_operations ftrace_avail_fops = {
 	.open = ftrace_avail_open,
 	.read = seq_read,
 	.llseek = seq_lseek,
-	.release = ftrace_avail_release,
+	.release = seq_release_private,
 };
 
 static const struct file_operations ftrace_failures_fops = {
 	.open = ftrace_failures_open,
 	.read = seq_read,
 	.llseek = seq_lseek,
-	.release = ftrace_avail_release,
+	.release = seq_release_private,
 };
 
 static const struct file_operations ftrace_filter_fops = {