1 files changed, 24 insertions, 21 deletions

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index d7bad90a5ad8..950682f35766 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -810,11 +810,9 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
                         trigger == IOAPIC_LEVEL)
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                               handle_fasteoi_irq, "fasteoi");
-        else {
-                irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
+        else
                 set_irq_chip_and_handler_name(irq, &ioapic_chip,
                                               handle_edge_irq, "edge");
-        }
 }
 static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
 {
@@ -831,7 +829,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
         entry.delivery_mode = INT_DELIVERY_MODE;
         entry.dest_mode = INT_DEST_MODE;
         entry.mask = 0;                         /* enable IRQ */
-        entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+        entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
 
         entry.trigger = irq_trigger(idx);
         entry.polarity = irq_polarity(idx);
@@ -839,7 +837,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
         if (irq_trigger(idx)) {
                 entry.trigger = 1;
                 entry.mask = 1;
-                entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+                entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
         }
 
         if (!apic && !IO_APIC_IRQ(irq))
@@ -851,7 +849,7 @@ static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
                 if (vector < 0)
                         return;
 
-                entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+                entry.dest = cpu_mask_to_apicid(mask);
                 entry.vector = vector;
 
                 ioapic_register_intr(irq, vector, IOAPIC_AUTO);
@@ -920,7 +918,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in
          */
         entry.dest_mode = INT_DEST_MODE;
         entry.mask = 0;                                 /* unmask IRQ now */
-        entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
+        entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
         entry.delivery_mode = INT_DELIVERY_MODE;
         entry.polarity = 0;
         entry.trigger = 0;
@@ -1020,18 +1018,17 @@ void __apicdebuginit print_IO_APIC(void)
 
         printk(KERN_DEBUG ".... IRQ redirection table:\n");
 
-        printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
-                          " Stat Dest Deli Vect:   \n");
+        printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
+                          " Stat Dmod Deli Vect:   \n");
 
         for (i = 0; i <= reg_01.bits.entries; i++) {
                 struct IO_APIC_route_entry entry;
 
                 entry = ioapic_read_entry(apic, i);
 
-                printk(KERN_DEBUG " %02x %03X %02X  ",
+                printk(KERN_DEBUG " %02x %03X ",
                         i,
-                        entry.dest.logical.logical_dest,
-                        entry.dest.physical.physical_dest
+                        entry.dest
                 );
 
                 printk("%1d    %1d    %1d   %1d   %1d    %1d    %1d    %02X\n",
@@ -1293,8 +1290,7 @@ void disable_IO_APIC(void)
                 entry.dest_mode       = 0; /* Physical */
                 entry.delivery_mode   = dest_ExtINT; /* ExtInt */
                 entry.vector          = 0;
-                entry.dest.physical.physical_dest =
-                                        GET_APIC_ID(apic_read(APIC_ID));
+                entry.dest          = GET_APIC_ID(apic_read(APIC_ID));
 
                 /*
                  * Add it to the IO-APIC irq-routing table:
@@ -1556,7 +1552,7 @@ static inline void unlock_ExtINT_logic(void)
 
         entry1.dest_mode = 0;                   /* physical delivery */
         entry1.mask = 0;                        /* unmask IRQ now */
-        entry1.dest.physical.physical_dest = hard_smp_processor_id();
+        entry1.dest = hard_smp_processor_id();
         entry1.delivery_mode = dest_ExtINT;
         entry1.polarity = entry0.polarity;
         entry1.trigger = 0;
@@ -1956,24 +1952,31 @@ static struct irq_chip msi_chip = {
         .retrigger      = ioapic_retrigger_irq,
 };
 
-int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev)
+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
 {
         struct msi_msg msg;
-        int ret;
+        int irq, ret;
+        irq = create_irq();
+        if (irq < 0)
+                return irq;
+
+        set_irq_msi(irq, desc);
         ret = msi_compose_msg(dev, irq, &msg);
-        if (ret < 0)
+        if (ret < 0) {
+                destroy_irq(irq);
                 return ret;
+        }
 
         write_msi_msg(irq, &msg);
 
         set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");
 
-        return 0;
+        return irq;
 }
 
 void arch_teardown_msi_irq(unsigned int irq)
 {
-        return;
+        destroy_irq(irq);
 }
 
 #endif /* CONFIG_PCI_MSI */
@@ -2124,7 +2127,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p
 
         entry.delivery_mode = INT_DELIVERY_MODE;
         entry.dest_mode = INT_DEST_MODE;
-        entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+        entry.dest = cpu_mask_to_apicid(mask);
         entry.trigger = triggering;
         entry.polarity = polarity;
         entry.mask = 1;                                  /* Disabled (masked) */