diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 276ec058f683..6170c6aeaf79 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -1012,11 +1012,6 @@ void __init mp_config_acpi_legacy_irqs(void) | |||
1012 | if (ioapic < 0) | 1012 | if (ioapic < 0) |
1013 | return; | 1013 | return; |
1014 | 1014 | ||
1015 | mp_irqs[mp_irq_entries].mp_type = MP_INTSRC; | ||
1016 | mp_irqs[mp_irq_entries].mp_irqflag = 0; /* Conforming */ | ||
1017 | mp_irqs[mp_irq_entries].mp_srcbus = MP_ISA_BUS; | ||
1018 | mp_irqs[mp_irq_entries].mp_dstapic = mp_ioapics[ioapic].mp_apicid; | ||
1019 | |||
1020 | /* | 1015 | /* |
1021 | * Use the default configuration for the IRQs 0-15. Unless | 1016 | * Use the default configuration for the IRQs 0-15. Unless |
1022 | * overridden by (MADT) interrupt source override entries. | 1017 | * overridden by (MADT) interrupt source override entries. |
@@ -1044,6 +1039,10 @@ void __init mp_config_acpi_legacy_irqs(void) | |||
1044 | continue; /* IRQ already used */ | 1039 | continue; /* IRQ already used */ |
1045 | } | 1040 | } |
1046 | 1041 | ||
1042 | mp_irqs[mp_irq_entries].mp_type = MP_INTSRC; | ||
1043 | mp_irqs[mp_irq_entries].mp_irqflag = 0; /* Conforming */ | ||
1044 | mp_irqs[mp_irq_entries].mp_srcbus = MP_ISA_BUS; | ||
1045 | mp_irqs[mp_irq_entries].mp_dstapic = mp_ioapics[ioapic].mp_apicid; | ||
1047 | mp_irqs[mp_irq_entries].mp_irqtype = mp_INT; | 1046 | mp_irqs[mp_irq_entries].mp_irqtype = mp_INT; |
1048 | mp_irqs[mp_irq_entries].mp_srcbusirq = i; /* Identity mapped */ | 1047 | mp_irqs[mp_irq_entries].mp_srcbusirq = i; /* Identity mapped */ |
1049 | mp_irqs[mp_irq_entries].mp_dstirq = i; | 1048 | mp_irqs[mp_irq_entries].mp_dstirq = i; |