diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:14:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:14:24 -0700 |
| commit | 75fcf64dc7180a6258dbefd671edb9d86a38d22f (patch) | |
| tree | ac8368354d1be984adbd49f1b570363387882567 | |
| parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
| parent | printk: Fix rq->lock vs logbuf_lock unlock lock inversion (diff) | |
| download | linux-dev-75fcf64dc7180a6258dbefd671edb9d86a38d22f.tar.xz linux-dev-75fcf64dc7180a6258dbefd671edb9d86a38d22f.zip | |
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
| -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) } } logbuf_cpu = UINT_MAX; + raw_spin_unlock(&logbuf_lock); if (wake) up(&console_sem); - raw_spin_unlock(&logbuf_lock); return retval; } |