Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (654fdd04) · Commits · 戴 / test

arch/x86/kernel/reboot.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -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"),
		},
		},
		{ }
		};

+7 −4

Original line number	Diff line number	Diff line
		@@ -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 &&
		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;