Commit 75fcf64d authored Jul 10, 2013 by Linus Torvalds

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

parents db6e3304 dbda92d1

kernel/printk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}