diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /kernel/irq/resend.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'kernel/irq/resend.c')
| -rw-r--r-- | kernel/irq/resend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index a8046791ba2d..89c7117acf2b 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c | |||
| @@ -33,10 +33,10 @@ static void resend_irqs(unsigned long arg) | |||
| 33 | struct irq_desc *desc; | 33 | struct irq_desc *desc; |
| 34 | int irq; | 34 | int irq; |
| 35 | 35 | ||
| 36 | while (!bitmap_empty(irqs_resend, NR_IRQS)) { | 36 | while (!bitmap_empty(irqs_resend, nr_irqs)) { |
| 37 | irq = find_first_bit(irqs_resend, NR_IRQS); | 37 | irq = find_first_bit(irqs_resend, nr_irqs); |
| 38 | clear_bit(irq, irqs_resend); | 38 | clear_bit(irq, irqs_resend); |
| 39 | desc = irq_desc + irq; | 39 | desc = irq_to_desc(irq); |
| 40 | local_irq_disable(); | 40 | local_irq_disable(); |
| 41 | desc->handle_irq(irq, desc); | 41 | desc->handle_irq(irq, desc); |
| 42 | local_irq_enable(); | 42 | local_irq_enable(); |