Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull printk locking fix from Thomas Gleixner:
 "A single lock ordering fix in the printk code"

* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  printk: Fix rq->lock vs logbuf_lock unlock lock inversion

diff --git a/kernel/printk.c b/kernel/printk.c
index 8212c1aef125f2d4290cbe0e55564d7e9a5a57de..d37d45c90ae6fc863a257f75751976a4bfe2f9ef 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1369,9 +1369,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;
 }