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

Pull EFI fix from Ingo Molnar: "Fix an EFI-fb regression that affects certain x86 systems" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: fbdev/efifb: Ignore framebuffer memmap entries that lack any memory types

drivers/video/fbdev/efifb.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -477,9 +477,13 @@ static int efifb_probe(struct platform_device *dev)
		* If the UEFI memory map covers the efifb region, we may only
		* remap it using the attributes the memory map prescribes.
		*/
		md.attribute &= EFI_MEMORY_UC \| EFI_MEMORY_WC \|
		EFI_MEMORY_WT \| EFI_MEMORY_WB;
		if (md.attribute) {
		mem_flags \|= EFI_MEMORY_WT \| EFI_MEMORY_WB;
		mem_flags &= md.attribute;
		}
		}
		if (mem_flags & EFI_MEMORY_WC)
		info->screen_base = ioremap_wc(efifb_fix.smem_start,
		efifb_fix.smem_len);

Admin message