diff options
Diffstat (limited to 'arch/i386/kernel/mpparse.c')
-rw-r--r-- | arch/i386/kernel/mpparse.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c index db90d141481d..97dbf289dbd5 100644 --- a/arch/i386/kernel/mpparse.c +++ b/arch/i386/kernel/mpparse.c | |||
@@ -1069,11 +1069,9 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) | |||
1069 | */ | 1069 | */ |
1070 | static int gsi_to_irq[MAX_GSI_NUM]; | 1070 | static int gsi_to_irq[MAX_GSI_NUM]; |
1071 | 1071 | ||
1072 | #ifdef CONFIG_ACPI_BUS | ||
1073 | /* Don't set up the ACPI SCI because it's already set up */ | 1072 | /* Don't set up the ACPI SCI because it's already set up */ |
1074 | if (acpi_fadt.sci_int == gsi) | 1073 | if (acpi_fadt.sci_int == gsi) |
1075 | return gsi; | 1074 | return gsi; |
1076 | #endif | ||
1077 | 1075 | ||
1078 | ioapic = mp_find_ioapic(gsi); | 1076 | ioapic = mp_find_ioapic(gsi); |
1079 | if (ioapic < 0) { | 1077 | if (ioapic < 0) { |
@@ -1116,13 +1114,11 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) | |||
1116 | if (gsi < MAX_GSI_NUM) { | 1114 | if (gsi < MAX_GSI_NUM) { |
1117 | if (gsi > 15) | 1115 | if (gsi > 15) |
1118 | gsi = pci_irq++; | 1116 | gsi = pci_irq++; |
1119 | #ifdef CONFIG_ACPI_BUS | ||
1120 | /* | 1117 | /* |
1121 | * Don't assign IRQ used by ACPI SCI | 1118 | * Don't assign IRQ used by ACPI SCI |
1122 | */ | 1119 | */ |
1123 | if (gsi == acpi_fadt.sci_int) | 1120 | if (gsi == acpi_fadt.sci_int) |
1124 | gsi = pci_irq++; | 1121 | gsi = pci_irq++; |
1125 | #endif | ||
1126 | gsi_to_irq[irq] = gsi; | 1122 | gsi_to_irq[irq] = gsi; |
1127 | } else { | 1123 | } else { |
1128 | printk(KERN_ERR "GSI %u is too high\n", gsi); | 1124 | printk(KERN_ERR "GSI %u is too high\n", gsi); |