3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know.
------------------ From: "Bu, Yitian" <[email protected]> [ Upstream commit dbda92d16f8655044e082930e4e9d244b87fde77 ] 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 <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/e807e903fe6cbe4d95e420fbfcc273b8274...@nasanexd01h.na.qualcomm.com Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> --- kernel/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/printk.c b/kernel/printk.c index 2d3fc0e..74a3afb 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1364,9 +1364,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; } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
