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
This commit is contained in:
Linus Torvalds 2013-07-10 18:14:24 -07:00
commit 75fcf64dc7

View File

@ -1369,9 +1369,9 @@ static int console_trylock_for_printk(unsigned int cpu)
} }
} }
logbuf_cpu = UINT_MAX; logbuf_cpu = UINT_MAX;
raw_spin_unlock(&logbuf_lock);
if (wake) if (wake)
up(&console_sem); up(&console_sem);
raw_spin_unlock(&logbuf_lock);
return retval; return retval;
} }