From 25ef4b41cb339e081dbaee26aba8e5a4abd92278 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Sat, 6 Sep 2008 01:06:04 -0400 Subject: [PATCH] --- yaml --- r: 116615 b: refs/heads/master c: 644f991d4b920ab1f5043509651479420b293490 h: refs/heads/master i: 116613: 6ec8309dcac47c9d9e916839751427198e9d2d3d 116611: 92ab7ee9e56c27037b4fc61220df0fbe014460a1 116607: f2c63ae7f3d17aaf95afa8ec2d7db890b3293b01 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81a095570525..805e71f62b94 100644 --- 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 index b69966f0f144..c9e09d86e1d8 100644 --- 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)