aboutsummaryrefslogtreecommitdiff
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-07 21:02:10 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:16 +0100
commit3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6 (patch)
treef496998278faa653174e185924acb0c74ac2e1b2 /kernel/irq/manage.c
parent009b4c3b8ad584b3462734127a5bec680d5d6af4 (diff)
downloadlinux-stericsson-3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6.tar.gz
genirq: Move IRQ_ONESHOT to core
No users outside of core. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 7e5a50825088..aca4208a03ac 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -697,7 +697,7 @@ static int irq_thread(void *data)
};
struct irqaction *action = data;
struct irq_desc *desc = irq_to_desc(action->irq);
- int wake, oneshot = desc->status & IRQ_ONESHOT;
+ int wake, oneshot = desc->istate & IRQS_ONESHOT;
sched_setscheduler(current, SCHED_FIFO, &param);
current->irqaction = action;
@@ -897,12 +897,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
desc->status |= IRQ_PER_CPU;
#endif
- desc->status &= ~(IRQ_WAITING | IRQ_ONESHOT);
+ desc->status &= ~IRQ_WAITING;
desc->istate &= ~(IRQS_AUTODETECT | IRQS_SPURIOUS_DISABLED | \
- IRQS_INPROGRESS);
+ IRQS_INPROGRESS | IRQS_ONESHOT);
if (new->flags & IRQF_ONESHOT)
- desc->status |= IRQ_ONESHOT;
+ desc->istate |= IRQS_ONESHOT;
if (!(desc->status & IRQ_NOAUTOEN))
irq_startup(desc);