x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: 7a20c2fad61aa3624e83c671d36dbd36b2661476 x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
An EFI fix and two reboot-quirk fixes.
Thanks,
Ingo
------------------>
Dave Jones (1):
x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
Josh Boyer (1):
x86, efi: Don't map Boot Services on i386
Masoud Sharbiani (1):
x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
arch/x86/kernel/reboot.c | 18 +++++++++++++++++- arch/x86/platform/efi/efi.c | 11 +++++++---- 2 files changed, 24 insertions(+), 5 deletions(-)
arch/x86/kernel/reboot.c +17 -1
@@ -352,12 +352,28 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, { /* Handle problems with rebooting on the Precision M6600. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell Precision M6600", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"), }, }, + { /* Handle problems with rebooting on the Dell PowerEdge C6100. */ + .callback = set_pci_reboot, + .ident = "Dell PowerEdge C6100", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), + }, + }, + { /* Some C6100 machines were shipped with vendor being 'Dell'. */ + .callback = set_pci_reboot, + .ident = "Dell PowerEdge C6100", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell"), + DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), + }, + }, { } };
arch/x86/platform/efi/efi.c +7 -4
@@ -912,10 +912,13 @@ void __init efi_enter_virtual_mode(void)for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; -if (!(md->attribute &EFI_MEMORY_RUNTIME ) && - md->type !=EFI_BOOT_SERVICES_CODE && - md->type !=EFI_BOOT_SERVICES_DATA ) -continue ; +if (!(md->attribute &EFI_MEMORY_RUNTIME )) { +#ifdef CONFIG_X86_64 +if (md->type !=EFI_BOOT_SERVICES_CODE && + md->type != EFI_BOOT_SERVICES_DATA) +#endif +continue ; + } size = md->num_pages <<EFI_PAGE_SHIFT ; end = md->phys_addr + size;