diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:07:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:07:41 -0700 |
| commit | 34eddefee41a56b378d866897bf83ed909fb4ab3 (patch) | |
| tree | 80bb3ce474fb0c0f031122313544b0a40e63f6f5 /kernel/irq/pm.c | |
| parent | 0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (diff) | |
| parent | acc80c39929b9f2ff8b45fcfe103385a3e45c1a7 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"A resume_irq() fix, plus a number of static declaration fixes"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/digicolor: Drop unnecessary static
irqchip/mips-cpu: Drop unnecessary static
irqchip/gic/realview: Drop unnecessary static
irqchip/mips-gic: Remove population of irq domain names
genirq/PM: Properly pretend disabled state when force resuming interrupts
Diffstat (limited to 'kernel/irq/pm.c')
| -rw-r--r-- | kernel/irq/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index cea1de0161f1..6bd9b58429cc 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -149,6 +149,8 @@ static void resume_irq(struct irq_desc *desc) /* Pretend that it got disabled ! */ desc->depth++; + irq_state_set_disabled(desc); + irq_state_set_masked(desc); resume: desc->istate &= ~IRQS_SUSPENDED; __enable_irq(desc); |