1 files changed, 23 insertions, 23 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 973539c128a4..e245365670a4 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -346,29 +346,6 @@ void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int val
         writel(value, &io_apic->data);
 }
 
-static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-{
-        struct irq_pin_list *entry;
-        unsigned long flags;
-
-        raw_spin_lock_irqsave(&ioapic_lock, flags);
-        for_each_irq_pin(entry, cfg->irq_2_pin) {
-                unsigned int reg;
-                int pin;
-
-                pin = entry->pin;
-                reg = io_apic_read(entry->apic, 0x10 + pin*2);
-                /* Is the remote IRR bit set? */
-                if (reg & IO_APIC_REDIR_REMOTE_IRR) {
-                        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-                        return true;
-                }
-        }
-        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-
-        return false;
-}
-
 union entry_union {
         struct { u32 w1, w2; };
         struct IO_APIC_route_entry entry;
@@ -2519,6 +2496,29 @@ static void ack_apic_edge(struct irq_data *data)
 atomic_t irq_mis_count;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
+static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
+{
+        struct irq_pin_list *entry;
+        unsigned long flags;
+
+        raw_spin_lock_irqsave(&ioapic_lock, flags);
+        for_each_irq_pin(entry, cfg->irq_2_pin) {
+                unsigned int reg;
+                int pin;
+
+                pin = entry->pin;
+                reg = io_apic_read(entry->apic, 0x10 + pin*2);
+                /* Is the remote IRR bit set? */
+                if (reg & IO_APIC_REDIR_REMOTE_IRR) {
+                        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+                        return true;
+                }
+        }
+        raw_spin_unlock_irqrestore(&ioapic_lock, flags);
+
+        return false;
+}
+
 static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg)
 {
         /* If we are moving the irq we need to mask it */