diff options
| author | Bu, Yitian <ybu@qti.qualcomm.com> | 2013-02-18 12:53:37 +0000 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2014-03-24 18:27:06 -0400 |
| commit | 78247605f5147e5d4289dd5ea35d228b10776321 (patch) | |
| tree | 87e90335cdc6a95f7c8df04b4d84badabd6bfb2a | |
| parent | 64a5ebab2d96c5f799ce15c8af80cd76ce7a1783 (diff) | |
printk: Fix rq->lock vs logbuf_lock unlock lock inversion
commit 07354eb1a74d1 ("locking printk: Annotate logbuf_lock as raw")
reintroduced a lock inversion problem which was fixed in commit
0b5e1c5255 ("printk: Release console_sem after logbuf_lock"). This
happened probably when fixing up patch rejects.
Restore the ordering and unlock logbuf_lock before releasing
console_sem.
Signed-off-by: ybu <ybu@qti.qualcomm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: stable@vger.kernel.org
Cc: stable-rt@vger.kernel.org
Link: http://lkml.kernel.org/r/E807E903FE6CBE4D95E420FBFCC273B827413C@nasanexd01h.na.qualcomm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 1aec6c0c519a..7cba53c80181 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -879,9 +879,9 @@ static int console_trylock_for_printk(unsigned int cpu, unsigned long flags) } } printk_cpu = UINT_MAX; + raw_spin_unlock(&logbuf_lock); if (wake) up(&console_sem); - raw_spin_unlock(&logbuf_lock); return retval; } static const char recursion_bug_msg [] = |