From e7f35186fe5519880c09477e0b0a1702efeaf234 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Wed, 13 Mar 2013 11:15:19 -0400
Subject: [PATCH] --- yaml --- r: 361553 b: refs/heads/master c:
 740466bc89ad8bd5afcc8de220f715f62b21e365 h: refs/heads/master i:   361551:
 16303c112f5ae0491f15e7eaddc118255b3a29b8 v: v3

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

diff --git a/[refs] b/[refs]
index 42253655a77f..bdc7c9cc6d3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2721e72dd10f71a3ba90f59781becf02638aa0d9
+refs/heads/master: 740466bc89ad8bd5afcc8de220f715f62b21e365
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 98ca94a41819..e6effd0c40a9 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -3108,8 +3108,8 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
 					continue;
 			}
 
-			hlist_del(&entry->node);
-			call_rcu(&entry->rcu, ftrace_free_entry_rcu);
+			hlist_del_rcu(&entry->node);
+			call_rcu_sched(&entry->rcu, ftrace_free_entry_rcu);
 		}
 	}
 	__disable_ftrace_function_probe();