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

75fcf64d · Linus Torvalds <[email protected]> · 2013-07-10 18:14:24 -07:00

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

Commit: 75fcf64dc7180a6258dbefd671edb9d86a38d22f
Parents: db6e3304 · dbda92d1

Merge commit. Changes below are compared with the first parent: db6e3304.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/printk.c	modified	+1	−1	View file

kernel/printk.c

View file

diff --git a/kernel/printk.c b/kernel/printk.c
index 8212c1a..d37d45c 100644
--- 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;
 }
 