Commit 71ac3d19388ecb71e0a83c2e07c3b79154edbe6a
Exists in
master
and in
20 other branches
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "A build fix and a reboot quirk" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/reboot: Add reboot quirk for Dell Latitude E5410 x86, build, pci: Fix PCI_MSI build on !SMP
Showing 3 changed files Side-by-side Diff
arch/x86/Kconfig
| ... | ... | @@ -860,7 +860,7 @@ |
| 860 | 860 | |
| 861 | 861 | config X86_UP_APIC |
| 862 | 862 | bool "Local APIC support on uniprocessors" |
| 863 | - depends on X86_32 && !SMP && !X86_32_NON_STANDARD | |
| 863 | + depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI | |
| 864 | 864 | ---help--- |
| 865 | 865 | A local APIC (Advanced Programmable Interrupt Controller) is an |
| 866 | 866 | integrated interrupt controller in the CPU. If you have a single-CPU |
| 867 | 867 | |
| ... | ... | @@ -885,11 +885,11 @@ |
| 885 | 885 | |
| 886 | 886 | config X86_LOCAL_APIC |
| 887 | 887 | def_bool y |
| 888 | - depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC | |
| 888 | + depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI | |
| 889 | 889 | |
| 890 | 890 | config X86_IO_APIC |
| 891 | 891 | def_bool y |
| 892 | - depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC | |
| 892 | + depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI | |
| 893 | 893 | |
| 894 | 894 | config X86_VISWS_APIC |
| 895 | 895 | def_bool y |
arch/x86/kernel/reboot.c
| ... | ... | @@ -326,6 +326,14 @@ |
| 326 | 326 | DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"), |
| 327 | 327 | }, |
| 328 | 328 | }, |
| 329 | + { /* Handle problems with rebooting on the Latitude E5410. */ | |
| 330 | + .callback = set_pci_reboot, | |
| 331 | + .ident = "Dell Latitude E5410", | |
| 332 | + .matches = { | |
| 333 | + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | |
| 334 | + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"), | |
| 335 | + }, | |
| 336 | + }, | |
| 329 | 337 | { /* Handle problems with rebooting on the Latitude E5420. */ |
| 330 | 338 | .callback = set_pci_reboot, |
| 331 | 339 | .ident = "Dell Latitude E5420", |
drivers/iommu/Kconfig
| ... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 | select PCI_PRI |
| 53 | 53 | select PCI_PASID |
| 54 | 54 | select IOMMU_API |
| 55 | - depends on X86_64 && PCI && ACPI && X86_IO_APIC | |
| 55 | + depends on X86_64 && PCI && ACPI | |
| 56 | 56 | ---help--- |
| 57 | 57 | With this option you can enable support for AMD IOMMU hardware in |
| 58 | 58 | your system. An IOMMU is a hardware component which provides |