1 files changed, 10 insertions, 13 deletions

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index e63a5bd2a78f..6ad4658de705 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -37,9 +37,6 @@
 #include <linux/kthread.h>
 #include <linux/jiffies.h>      /* time_after() */
 #include <linux/slab.h>
-#ifdef CONFIG_ACPI
-#include <acpi/acpi_bus.h>
-#endif
 #include <linux/bootmem.h>
 #include <linux/dmar.h>
 #include <linux/hpet.h>
@@ -1142,9 +1139,10 @@ next:
                 if (test_bit(vector, used_vectors))
                         goto next;
 
-                for_each_cpu_and(new_cpu, tmp_mask, cpu_online_mask)
-                        if (per_cpu(vector_irq, new_cpu)[vector] != -1)
+                for_each_cpu_and(new_cpu, tmp_mask, cpu_online_mask) {
+                        if (per_cpu(vector_irq, new_cpu)[vector] > VECTOR_UNDEFINED)
                                 goto next;
+                }
                 /* Found one! */
                 current_vector = vector;
                 current_offset = offset;
@@ -1183,7 +1181,7 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg)
 
         vector = cfg->vector;
         for_each_cpu_and(cpu, cfg->domain, cpu_online_mask)
-                per_cpu(vector_irq, cpu)[vector] = -1;
+                per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
 
         cfg->vector = 0;
         cpumask_clear(cfg->domain);
@@ -1191,11 +1189,10 @@ static void __clear_irq_vector(int irq, struct irq_cfg *cfg)
         if (likely(!cfg->move_in_progress))
                 return;
         for_each_cpu_and(cpu, cfg->old_domain, cpu_online_mask) {
-                for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS;
-                                                                vector++) {
+                for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
                         if (per_cpu(vector_irq, cpu)[vector] != irq)
                                 continue;
-                        per_cpu(vector_irq, cpu)[vector] = -1;
+                        per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
                         break;
                 }
         }
@@ -1228,12 +1225,12 @@ void __setup_vector_irq(int cpu)
         /* Mark the free vectors */
         for (vector = 0; vector < NR_VECTORS; ++vector) {
                 irq = per_cpu(vector_irq, cpu)[vector];
-                if (irq < 0)
+                if (irq <= VECTOR_UNDEFINED)
                         continue;
 
                 cfg = irq_cfg(irq);
                 if (!cpumask_test_cpu(cpu, cfg->domain))
-                        per_cpu(vector_irq, cpu)[vector] = -1;
+                        per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;
         }
         raw_spin_unlock(&vector_lock);
 }
@@ -2202,13 +2199,13 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
 
         me = smp_processor_id();
         for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
-                unsigned int irq;
+                int irq;
                 unsigned int irr;
                 struct irq_desc *desc;
                 struct irq_cfg *cfg;
                 irq = __this_cpu_read(vector_irq[vector]);
 
-                if (irq == -1)
+                if (irq <= VECTOR_UNDEFINED)
                         continue;
 
                 desc = irq_to_desc(irq);