diff options
| author |   Bu, Yitian <ybu@qti.qualcomm.com> | 2013-02-18 12:53:37 +0000 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2013-02-18 15:05:57 +0100 |
| commit | dbda92d16f8655044e082930e4e9d244b87fde77 (patch) | |
| tree | b8e10565d24b46d953413d2d6caa612608dfb95f /kernel/printk.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-dev-dbda92d16f8655044e082930e4e9d244b87fde77.tar.xz linux-dev-dbda92d16f8655044e082930e4e9d244b87fde77.zip | |
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
Link: http://lkml.kernel.org/r/E807E903FE6CBE4D95E420FBFCC273B827413C@nasanexd01h.na.qualcomm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to '')
| -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 267ce780abe8..e698e80d8428 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1358,9 +1358,9 @@ static int console_trylock_for_printk(unsigned int cpu) } } logbuf_cpu = UINT_MAX; + raw_spin_unlock(&logbuf_lock); if (wake) up(&console_sem); - raw_spin_unlock(&logbuf_lock); return retval; } |