diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-06-29 02:24:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 10:26:24 -0700 |
| commit | 3418d72404e35eb19e7995cbf3e7a76ba8fefbce (patch) | |
| tree | 08e727f94d4ff31410730d5d42119b3520ad10ca /kernel/irq | |
| parent | a4633adcdbc15ac51afcd0e1395de58cee27cf92 (diff) | |
[PATCH] genirq: add IRQ_NOPROBE support
Introduce IRQ_NOPROBE: enables platforms to control chip-probing.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/autoprobe.c | 4 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 5c988bba401..ed98c7d46cf 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c @@ -40,7 +40,7 @@ unsigned long probe_irq_on(void) desc = irq_desc + i; spin_lock_irq(&desc->lock); - if (!desc->action) + if (!desc->action && !(desc->status & IRQ_NOPROBE)) desc->chip->startup(i); spin_unlock_irq(&desc->lock); } @@ -57,7 +57,7 @@ unsigned long probe_irq_on(void) desc = irq_desc + i; spin_lock_irq(&desc->lock); - if (!desc->action) { + if (!desc->action && !(desc->status & IRQ_NOPROBE)) { desc->status |= IRQ_AUTODETECT | IRQ_WAITING; if (desc->chip->startup(i)) desc->status |= IRQ_PENDING; diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cffde484389..90a944a7fad 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -118,6 +118,10 @@ void enable_irq(unsigned int irq) WARN_ON(1); break; case 1: { + unsigned int status = desc->status & ~IRQ_DISABLED; + + /* Prevent probing on this irq: */ + desc->status = status | IRQ_NOPROBE; check_irq_resend(desc, irq); /* fall-through */ } |