diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-02 13:10:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-02 13:10:42 -0700 |
commit | 5a30a78924ecd97b0335d2e1d3e01a5023c1a3d8 (patch) | |
tree | 7c31e09a571450d6303468ad28f736ae42cc27b9 | |
parent | 142c3326b055a278c303bfef8dc6a105fff18ca6 (diff) | |
parent | bdd65589593edd79b6a12ce86b3b7a7c6dae5208 (diff) |
Merge tag 'x86-urgent-2020-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"A single fix for a potential deadlock when printing a message about
spurious interrupts"
* tag 'x86-urgent-2020-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/i8259: Use printk_deferred() to prevent deadlock
-rw-r--r-- | arch/x86/kernel/i8259.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index f3c76252247d..282b4ee1339f 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c @@ -207,7 +207,7 @@ spurious_8259A_irq: * lets ACK and report it. [once per IRQ] */ if (!(spurious_irq_mask & irqmask)) { - printk(KERN_DEBUG + printk_deferred(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; } |