From b168f08b2a287bcf5e987d8f5fdd8bee8b783134 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 19 Sep 2009 11:55:44 -0700
Subject: [PATCH] --- yaml --- r: 164322 b: refs/heads/master c:
 89f19f04dc72363d912fd007a399cb10310eff6e h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h |  2 +-
 trunk/kernel/sched.c        | 10 ++--------
 trunk/kernel/trace/trace.c  |  8 +++++++-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 438169cd790d..234588c1a4f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f04e8cd5b24727a2500f8ab8f3de730ba47b02c
+refs/heads/master: 89f19f04dc72363d912fd007a399cb10310eff6e
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 8af3d249170e..cc37a3fa5065 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -257,7 +257,7 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);
 extern void init_idle(struct task_struct *idle, int cpu);
 extern void init_idle_bootup_task(struct task_struct *idle);
 
-extern int runqueue_is_locked(void);
+extern int runqueue_is_locked(int cpu);
 extern void task_rq_unlock_wait(struct task_struct *p);
 
 extern cpumask_var_t nohz_cpu_mask;
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index faf4d463bbff..575fb0139038 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -681,15 +681,9 @@ inline void update_rq_clock(struct rq *rq)
  * This interface allows printk to be called with the runqueue lock
  * held and know whether or not it is OK to wake up the klogd.
  */
-int runqueue_is_locked(void)
+int runqueue_is_locked(int cpu)
 {
-	int cpu = get_cpu();
-	struct rq *rq = cpu_rq(cpu);
-	int ret;
-
-	ret = spin_is_locked(&rq->lock);
-	put_cpu();
-	return ret;
+	return spin_is_locked(&cpu_rq(cpu)->lock);
 }
 
 /*
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index fd52a19dd172..420232a1fbba 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -275,12 +275,18 @@ static DEFINE_SPINLOCK(tracing_start_lock);
  */
 void trace_wake_up(void)
 {
+	int cpu;
+
+	if (trace_flags & TRACE_ITER_BLOCK)
+		return;
 	/*
 	 * The runqueue_is_locked() can fail, but this is the best we
 	 * have for now:
 	 */
-	if (!(trace_flags & TRACE_ITER_BLOCK) && !runqueue_is_locked())
+	cpu = get_cpu();
+	if (!runqueue_is_locked(cpu))
 		wake_up(&trace_wait);
+	put_cpu();
 }
 
 static int __init set_buf_size(char *str)