summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-10 18:14:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-10 18:14:24 -0700
commit75fcf64dc7180a6258dbefd671edb9d86a38d22f (patch)
treeac8368354d1be984adbd49f1b570363387882567 /kernel/printk.c
parentdb6e330490e448733e7836833e25e96034770058 (diff)
parentdbda92d16f8655044e082930e4e9d244b87fde77 (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/printk.c')
-rw-r--r--kernel/printk.c2
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;
}