---

yaml --- r: 116615 b: refs/heads/master c: 644f991 h: refs/heads/master i: 116613: 6ec8309 116611: 92ab7ee 116607: f2c63ae v: v3
git-mirror · Oct 14, 2008 · 25ef4b4 · 25ef4b4
1 parent b5b6448
commit 25ef4b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0719e5a4b1ccc04180b7a7b71095c9fb7131919
+refs/heads/master: 644f991d4b920ab1f5043509651479420b293490
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -170,7 +170,8 @@ static int __unregister_ftrace_function(struct ftrace_ops *ops)
  */
 static DEFINE_SPINLOCK(ftrace_hash_lock);
 #define ftrace_hash_lock(flags)	  spin_lock_irqsave(&ftrace_hash_lock, flags)
-#define ftrace_hash_unlock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags)
+#define ftrace_hash_unlock(flags) \
+			spin_unlock_irqrestore(&ftrace_hash_lock, flags)
 #else
 /* This is protected via the ftrace_lock with MCOUNT_RECORD. */
 #define ftrace_hash_lock(flags)   do { (void)(flags); } while (0)