Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71ac3d19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ccaa8be8 8412da75

arch/x86/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ source "kernel/Kconfig.preempt" 


config X86_UP_APIC

	bool "Local APIC support on uniprocessors"

	depends on X86_32 && !SMP && !X86_32_NON_STANDARD

	depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI

	---help---

	  A local APIC (Advanced Programmable Interrupt Controller) is an

	  integrated interrupt controller in the CPU. If you have a single-CPU
@@ -885,11 +885,11 @@ config X86_UP_IOAPIC 


config X86_LOCAL_APIC

	def_bool y

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI



config X86_IO_APIC

	def_bool y

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC

	depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI



config X86_VISWS_APIC

	def_bool y

arch/x86/kernel/reboot.c

+8 −0
Original line number Diff line number Diff line
@@ -326,6 +326,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),

		},

	},

	{	/* Handle problems with rebooting on the Latitude E5410. */

		.callback = set_pci_reboot,

		.ident = "Dell Latitude E5410",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5410"),

		},

	},

	{	/* Handle problems with rebooting on the Latitude E5420. */

		.callback = set_pci_reboot,

		.ident = "Dell Latitude E5420",

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ config AMD_IOMMU 
	select PCI_PRI

	select PCI_PASID

	select IOMMU_API

	depends on X86_64 && PCI && ACPI && X86_IO_APIC

	depends on X86_64 && PCI && ACPI

	---help---

	  With this option you can enable support for AMD IOMMU hardware in

	  your system. An IOMMU is a hardware component which provides