From cbb398edaa94c5152c327e3a8697337a38486548 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 25 Aug 2008 13:08:44 +1000 Subject: [PATCH] --- yaml --- r: 116599 b: refs/heads/master c: 2d7da80f7138c4276ef4fa0334be400b805d0fbf h: refs/heads/master i: 116597: dc70f769b1c887a846bd95204370f4ab26ca627e 116595: 6a11a11acbc542608552cad4e9ea4c8075cecd16 116591: ec5582635eaab9682fcc1b3f314012a2c31bbac9 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e3f66990a4a..c7c27fc8ca72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f93fc076a464bfe24e8d4c5fea3f6ca5bdb264d +refs/heads/master: 2d7da80f7138c4276ef4fa0334be400b805d0fbf diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 43665add9805..7599abdf6d4d 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -161,8 +161,8 @@ static int __unregister_ftrace_function(struct ftrace_ops *ops) * not recorded via the compilation. */ 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_lock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags) +#define ftrace_hash_unlock(flags) spin_lock_irqsave(&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)