Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fix from Ingo Molnar: "An arm64 boot crash fix" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/arm64: Don't apply MEMBLOCK_NOMAP to UEFI memory map mapping
This commit is contained in:
Коммит
e2f50c5c6c
|
@ -203,7 +203,19 @@ void __init efi_init(void)
|
||||||
|
|
||||||
reserve_regions();
|
reserve_regions();
|
||||||
early_memunmap(memmap.map, params.mmap_size);
|
early_memunmap(memmap.map, params.mmap_size);
|
||||||
memblock_mark_nomap(params.mmap & PAGE_MASK,
|
|
||||||
PAGE_ALIGN(params.mmap_size +
|
if (IS_ENABLED(CONFIG_ARM)) {
|
||||||
(params.mmap & ~PAGE_MASK)));
|
/*
|
||||||
|
* ARM currently does not allow ioremap_cache() to be called on
|
||||||
|
* memory regions that are covered by struct page. So remove the
|
||||||
|
* UEFI memory map from the linear mapping.
|
||||||
|
*/
|
||||||
|
memblock_mark_nomap(params.mmap & PAGE_MASK,
|
||||||
|
PAGE_ALIGN(params.mmap_size +
|
||||||
|
(params.mmap & ~PAGE_MASK)));
|
||||||
|
} else {
|
||||||
|
memblock_reserve(params.mmap & PAGE_MASK,
|
||||||
|
PAGE_ALIGN(params.mmap_size +
|
||||||
|
(params.mmap & ~PAGE_MASK)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче