--- arch/x86/kernel/acpi/boot.c

+++ arch/x86/kernel/acpi/boot.c

@@ -446,6 +446,12 @@ void __init acpi_pic_sci_set_trigger(uns

int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)

{

*irq = gsi;

+

+#ifdef CONFIG_X86_IO_APIC

+ if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC)

+ setup_IO_APIC_irq_extra(gsi);

+#endif

+

return 0;

}

@@ -473,7 +479,8 @@ int acpi_register_gsi(struct device *dev

plat_gsi = mp_register_gsi(dev, gsi, trigger, polarity);

}

#endif

- acpi_gsi_to_irq(plat_gsi, &irq);

+ irq = plat_gsi;

+

return irq;

}

@@ -1184,9 +1191,6 @@ static void __init acpi_process_madt(voi

if (!error) {

acpi_lapic = 1;

-#ifdef CONFIG_X86_BIGSMP

- generic_bigsmp_probe();

-#endif

/*

* Parse MADT IO-APIC entries

*/

@@ -1196,8 +1200,6 @@ static void __init acpi_process_madt(voi

acpi_ioapic = 1;

smp_found_config = 1;

- if (apic->setup_apic_routing)

- apic->setup_apic_routing();

}

}

if (error == -EINVAL) {

@@ -1347,14 +1349,6 @@ static struct dmi_system_id __initdata a

},

},

{

- .callback = force_acpi_ht,

- .ident = "ASUS P2B-DS",

- .matches = {

- DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),

- DMI_MATCH(DMI_BOARD_NAME, "P2B-DS"),

- },

- },

- {

.callback = force_acpi_ht,

.ident = "ASUS CUR-DLS",

.matches = {