Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"An EFI fix and two reboot-quirk fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
x86/reboot: Add quirk to make Dell C6100 use reboot=pci automatically
x86, efi: Don't map Boot Services on i386
+24
-5
+17
-1
arch/x86/kernel/reboot.c
+17
-1
arch/x86/kernel/reboot.c
···
352
352
},
353
353
{ /* Handle problems with rebooting on the Precision M6600. */
354
354
.callback = set_pci_reboot,
355
-
.ident = "Dell OptiPlex 990",
355
+
.ident = "Dell Precision M6600",
356
356
.matches = {
357
357
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
358
358
DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
359
+
},
360
+
},
361
+
{ /* Handle problems with rebooting on the Dell PowerEdge C6100. */
362
+
.callback = set_pci_reboot,
363
+
.ident = "Dell PowerEdge C6100",
364
+
.matches = {
365
+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
366
+
DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
367
+
},
368
+
},
369
+
{ /* Some C6100 machines were shipped with vendor being 'Dell'. */
370
+
.callback = set_pci_reboot,
371
+
.ident = "Dell PowerEdge C6100",
372
+
.matches = {
373
+
DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
374
+
DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
359
375
},
360
376
},
361
377
{ }
+7
-4
arch/x86/platform/efi/efi.c
+7
-4
arch/x86/platform/efi/efi.c
···
912
912
913
913
for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
914
914
md = p;
915
-
if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
916
-
md->type != EFI_BOOT_SERVICES_CODE &&
917
-
md->type != EFI_BOOT_SERVICES_DATA)
918
-
continue;
915
+
if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
916
+
#ifdef CONFIG_X86_64
917
+
if (md->type != EFI_BOOT_SERVICES_CODE &&
918
+
md->type != EFI_BOOT_SERVICES_DATA)
919
+
#endif
920
+
continue;
921
+
}
919
922
920
923
size = md->num_pages << EFI_PAGE_SHIFT;
921
924
end = md->phys_addr + size;