diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2009-04-20 16:02:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-21 03:08:26 -0400 |
commit | 25629d810a52176758401184d9b437fbb7f79195 (patch) | |
tree | 4d7ab567477c889de4833c591348868cefa6a8b6 /arch | |
parent | fc1edaf9e7cc4d4696f83dee495b8f158d01c4eb (diff) |
x86: x2apic, IR: Move eoi_ioapic_irq() into a CONFIG_INTR_REMAP section
Address the following complier warning:
arch/x86/kernel/apic/io_apic.c:2543: warning: `eoi_ioapic_irq' defined but not used
By moving that function (and eoi_ioapic_irq()) into an existing
#ifdef CONFIG_INTR_REMAP section of the code.
[ Impact: cleanup ]
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: dwmw2@infradead.org
Cc: Weidong Han <weidong.han@intel.com>
LKML-Reference: <20090420200450.271099000@linux-os.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Weidong Han <weidong.han@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 3a45d2ec9740..4baa9cbd630a 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -2517,39 +2517,6 @@ static void irq_complete_move(struct irq_desc **descp) | |||
2517 | static inline void irq_complete_move(struct irq_desc **descp) {} | 2517 | static inline void irq_complete_move(struct irq_desc **descp) {} |
2518 | #endif | 2518 | #endif |
2519 | 2519 | ||
2520 | static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg) | ||
2521 | { | ||
2522 | int apic, pin; | ||
2523 | struct irq_pin_list *entry; | ||
2524 | |||
2525 | entry = cfg->irq_2_pin; | ||
2526 | for (;;) { | ||
2527 | |||
2528 | if (!entry) | ||
2529 | break; | ||
2530 | |||
2531 | apic = entry->apic; | ||
2532 | pin = entry->pin; | ||
2533 | io_apic_eoi(apic, pin); | ||
2534 | entry = entry->next; | ||
2535 | } | ||
2536 | } | ||
2537 | |||
2538 | static void | ||
2539 | eoi_ioapic_irq(struct irq_desc *desc) | ||
2540 | { | ||
2541 | struct irq_cfg *cfg; | ||
2542 | unsigned long flags; | ||
2543 | unsigned int irq; | ||
2544 | |||
2545 | irq = desc->irq; | ||
2546 | cfg = desc->chip_data; | ||
2547 | |||
2548 | spin_lock_irqsave(&ioapic_lock, flags); | ||
2549 | __eoi_ioapic_irq(irq, cfg); | ||
2550 | spin_unlock_irqrestore(&ioapic_lock, flags); | ||
2551 | } | ||
2552 | |||
2553 | static void ack_apic_edge(unsigned int irq) | 2520 | static void ack_apic_edge(unsigned int irq) |
2554 | { | 2521 | { |
2555 | struct irq_desc *desc = irq_to_desc(irq); | 2522 | struct irq_desc *desc = irq_to_desc(irq); |
@@ -2659,6 +2626,39 @@ static void ack_apic_level(unsigned int irq) | |||
2659 | } | 2626 | } |
2660 | 2627 | ||
2661 | #ifdef CONFIG_INTR_REMAP | 2628 | #ifdef CONFIG_INTR_REMAP |
2629 | static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg) | ||
2630 | { | ||
2631 | int apic, pin; | ||
2632 | struct irq_pin_list *entry; | ||
2633 | |||
2634 | entry = cfg->irq_2_pin; | ||
2635 | for (;;) { | ||
2636 | |||
2637 | if (!entry) | ||
2638 | break; | ||
2639 | |||
2640 | apic = entry->apic; | ||
2641 | pin = entry->pin; | ||
2642 | io_apic_eoi(apic, pin); | ||
2643 | entry = entry->next; | ||
2644 | } | ||
2645 | } | ||
2646 | |||
2647 | static void | ||
2648 | eoi_ioapic_irq(struct irq_desc *desc) | ||
2649 | { | ||
2650 | struct irq_cfg *cfg; | ||
2651 | unsigned long flags; | ||
2652 | unsigned int irq; | ||
2653 | |||
2654 | irq = desc->irq; | ||
2655 | cfg = desc->chip_data; | ||
2656 | |||
2657 | spin_lock_irqsave(&ioapic_lock, flags); | ||
2658 | __eoi_ioapic_irq(irq, cfg); | ||
2659 | spin_unlock_irqrestore(&ioapic_lock, flags); | ||
2660 | } | ||
2661 | |||
2662 | static void ir_ack_apic_edge(unsigned int irq) | 2662 | static void ir_ack_apic_edge(unsigned int irq) |
2663 | { | 2663 | { |
2664 | ack_APIC_irq(); | 2664 | ack_APIC_irq(); |