diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 21:14:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 21:14:24 -0400 |
commit | 75fcf64dc7180a6258dbefd671edb9d86a38d22f (patch) | |
tree | ac8368354d1be984adbd49f1b570363387882567 /kernel | |
parent | db6e330490e448733e7836833e25e96034770058 (diff) | |
parent | dbda92d16f8655044e082930e4e9d244b87fde77 (diff) |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
Diffstat (limited to 'kernel')
-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 8212c1aef125..d37d45c90ae6 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -1369,9 +1369,9 @@ static int console_trylock_for_printk(unsigned int cpu) | |||
1369 | } | 1369 | } |
1370 | } | 1370 | } |
1371 | logbuf_cpu = UINT_MAX; | 1371 | logbuf_cpu = UINT_MAX; |
1372 | raw_spin_unlock(&logbuf_lock); | ||
1372 | if (wake) | 1373 | if (wake) |
1373 | up(&console_sem); | 1374 | up(&console_sem); |
1374 | raw_spin_unlock(&logbuf_lock); | ||
1375 | return retval; | 1375 | return retval; |
1376 | } | 1376 | } |
1377 | 1377 | ||