Merge with /shiny/git/linux-2.6/.git

1 files changed, 26 insertions, 8 deletions

diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 9c5aa2a790c7..79c362d03e2e 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -109,7 +109,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
 
 static void __init MP_processor_info (struct mpc_config_processor *m)
 {
-        int ver;
+        int ver, cpu;
         static int found_bsp=0;
 
         if (!(m->mpc_cpuflag & CPU_ENABLED))
@@ -131,7 +131,7 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
                 return;
         }
 
-        num_processors++;
+        cpu = num_processors++;
 
         if (m->mpc_apicid > MAX_APICS) {
                 printk(KERN_ERR "Processor #%d INVALID. (Max ID: %d).\n",
@@ -155,13 +155,18 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
                  * in same order as logical cpu numbers. Hence the first
                  * entry is BSP, and so on.
                  */
+                cpu = 0;
+
                 bios_cpu_apicid[0] = m->mpc_apicid;
                 x86_cpu_to_apicid[0] = m->mpc_apicid;
                 found_bsp = 1;
-        } else {
-                bios_cpu_apicid[num_processors - found_bsp] = m->mpc_apicid;
-                x86_cpu_to_apicid[num_processors - found_bsp] = m->mpc_apicid;
-        }
+        } else
+                cpu = num_processors - found_bsp;
+        bios_cpu_apicid[cpu] = m->mpc_apicid;
+        x86_cpu_to_apicid[cpu] = m->mpc_apicid;
+
+        cpu_set(cpu, cpu_possible_map);
+        cpu_set(cpu, cpu_present_map);
 }
 
 static void __init MP_bus_info (struct mpc_config_bus *m)
@@ -965,8 +970,21 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
                  * due to unused I/O APIC pins.
                  */
                 int irq = gsi;
-                gsi = pci_irq++;
-                gsi_to_irq[irq] = gsi;
+                if (gsi < MAX_GSI_NUM) {
+                        if (gsi > 15)
+                                gsi = pci_irq++;
+#ifdef CONFIG_ACPI_BUS
+                        /*
+                         * Don't assign IRQ used by ACPI SCI
+                         */
+                        if (gsi == acpi_fadt.sci_int)
+                                gsi = pci_irq++;
+#endif
+                        gsi_to_irq[irq] = gsi;
+                } else {
+                        printk(KERN_ERR "GSI %u is too high\n", gsi);
+                        return gsi;
+                }
         }
 
         io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,