diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-08 16:38:00 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-08 16:38:21 +0100 |
| commit | c9a443cdf7726ce8b78c3177c6ae601ce37292fc (patch) | |
| tree | 4191db70a690b8eb7c86d8c3c10f827e4f2ab32a /kernel/irq/manage.c | |
| parent | 285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 (diff) | |
| parent | dc5f219e88294b93009eef946251251ffffb6d60 (diff) | |
Merge branch 'irq/for-xen' into irq/core
irq/for-xen contains new functionality to avoid Xen private irq
hackery. That branch has a single irq commit and is pulled by Xen to
base their new features on.
Merge it into irq/core as other patches modify the same code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 538fce2db51..a06b9b6d6b5 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -359,8 +359,17 @@ EXPORT_SYMBOL(disable_irq); void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume) { - if (resume) + if (resume) { + if (!(desc->status & IRQ_SUSPENDED)) { + if (!desc->action) + return; + if (!(desc->action->flags & IRQF_FORCE_RESUME)) + return; + /* Pretend that it got disabled ! */ + desc->depth++; + } desc->status &= ~IRQ_SUSPENDED; + } switch (desc->depth) { case 0: |