lkml.org 
[lkml]   [2012]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] x86: io_apic: Move and reenable irq only when CONFIG_GENERIC_PENDING_IRQ=y
When CONFIG_GENERIC_PENDING_IRQ=n irq move and reenable code is never get
executed, nor do_unmask_irq variable updates its init value. Move both the
code and do_unmask_irq under CONFIG_GENERIC_PENDING_IRQ macro.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
arch/x86/kernel/apic/io_apic.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index fb07275..57dec14 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2515,8 +2515,11 @@ atomic_t irq_mis_count;
static void ack_apic_level(struct irq_data *data)
{
struct irq_cfg *cfg = data->chip_data;
- int i, do_unmask_irq = 0, irq = data->irq;
+ int i, irq = data->irq;
unsigned long v;
+#ifdef CONFIG_GENERIC_PENDING_IRQ
+ int do_unmask_irq = 0;
+#endif

irq_complete_move(cfg);
#ifdef CONFIG_GENERIC_PENDING_IRQ
@@ -2581,6 +2584,7 @@ static void ack_apic_level(struct irq_data *data)
eoi_ioapic_irq(irq, cfg);
}

+#ifdef CONFIG_GENERIC_PENDING_IRQ
/* Now we can move and renable the irq */
if (unlikely(do_unmask_irq)) {
/* Only migrate the irq if the ack has been received.
@@ -2613,6 +2617,7 @@ static void ack_apic_level(struct irq_data *data)
irq_move_masked_irq(data);
unmask_ioapic(cfg);
}
+#endif
}

#ifdef CONFIG_IRQ_REMAP
--
1.7.7.6


\
 
 \ /
  Last update: 2012-03-02 10:33    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean