projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 54afa83f JR |
1 | diff -urNp linux-4/arch/i386/kernel/apic.c linux-200/arch/i386/kernel/apic.c |
| 2 | --- linux-4/arch/i386/kernel/apic.c | |
| 3 | +++ linux-200/arch/i386/kernel/apic.c | |
| 4 | @@ -1179,9 +1179,10 @@ int __init APIC_init_uniprocessor (void) | |
| 5 | if (nmi_watchdog == NMI_LOCAL_APIC) | |
| 6 | check_nmi_watchdog(); | |
| 7 | #ifdef CONFIG_X86_IO_APIC | |
| 8 | - if (smp_found_config) | |
| 9 | - if (!skip_ioapic_setup && nr_ioapics) | |
| 10 | - setup_IO_APIC(); | |
| 11 | + if (smp_found_config && !skip_ioapic_setup && nr_ioapics) { | |
| 12 | + setup_IO_APIC(); | |
| 13 | + } else | |
| 14 | + nr_ioapics = 0; | |
| 15 | #endif | |
| 16 | setup_APIC_clocks(); | |
| 17 | ||
| 18 | diff -urNp linux-4/arch/i386/kernel/smpboot.c linux-200/arch/i386/kernel/smpboot.c | |
| 19 | --- linux-4/arch/i386/kernel/smpboot.c | |
| 20 | +++ linux-200/arch/i386/kernel/smpboot.c | |
| 21 | @@ -1207,8 +1207,10 @@ void __init smp_boot_cpus(void) | |
| 22 | * Here we can be sure that there is an IO-APIC in the system. Let's | |
| 23 | * go and set it up: | |
| 24 | */ | |
| 25 | - if (!skip_ioapic_setup && nr_ioapics) | |
| 26 | + if (!skip_ioapic_setup && nr_ioapics) { | |
| 27 | setup_IO_APIC(); | |
| 28 | + } else | |
| 29 | + nr_ioapics = 0; | |
| 30 | #endif | |
| 31 | ||
| 32 | /* | |
| 33 | diff -urNp linux-4/drivers/pci/quirks.c linux-200/drivers/pci/quirks.c | |
| 34 | --- linux-4/drivers/pci/quirks.c | |
| 35 | +++ linux-200/drivers/pci/quirks.c | |
| 54afa83f JR |
36 | @@ -644,6 +664,8 @@ static struct pci_fixup pci_fixups[] __i |
| 37 | ||
| 38 | #ifdef CONFIG_X86_IO_APIC | |
| 39 | { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_ioapic }, | |
| 40 | + { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, 0x7451, | |
| 41 | +quirk_amd_8131_ioapic }, | |
| 42 | #endif | |
| 43 | { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi }, | |
| 44 | { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi }, |