From 3970ca7782f6bfdca561ba61a0218ff6c25c248a Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 13 Jul 2011 15:08:31 -0400
Subject: [PATCH] --- yaml --- r: 257123 b: refs/heads/master c:
 072126f4529196f71a97960248bca54fd4554c2d h: refs/heads/master i:   257121:
 81897e7ec93b7df98983d800bfb2a72333cd7eb3   257119:
 adf545651ca54259d9b504e14163e5e3616d6ba2 v: v3

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

diff --git a/[refs] b/[refs]
index ec0e935433ad..a21338af161a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41fb61c2d08107ce96a5dcb3a6289b2afd3e135c
+refs/heads/master: 072126f4529196f71a97960248bca54fd4554c2d
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 853f6f0a4b4a..a0dc0de8d649 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -2869,6 +2869,10 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len,
 
 	mutex_lock(&ftrace_lock);
 	ret = ftrace_hash_move(ops, enable, orig_hash, hash);
+	if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED
+	    && ftrace_enabled)
+		ftrace_run_update_code(FTRACE_ENABLE_CALLS);
+
 	mutex_unlock(&ftrace_lock);
 
 	mutex_unlock(&ftrace_regex_lock);