projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-soc/for-4.8/soc' of http://github.com/Broadcom/stblinux into next/soc
[cascardo/linux.git]
/
drivers
/
firmware
/
efi
/
arm-init.c
diff --git
a/drivers/firmware/efi/arm-init.c
b/drivers/firmware/efi/arm-init.c
index
a850cbc
..
c49d50e
100644
(file)
--- a/
drivers/firmware/efi/arm-init.c
+++ b/
drivers/firmware/efi/arm-init.c
@@
-174,6
+174,7
@@
static __init void reserve_regions(void)
{
efi_memory_desc_t *md;
u64 paddr, npages, size;
{
efi_memory_desc_t *md;
u64 paddr, npages, size;
+ int resv;
if (efi_enabled(EFI_DBG))
pr_info("Processing EFI memory map:\n");
if (efi_enabled(EFI_DBG))
pr_info("Processing EFI memory map:\n");
@@
-190,12
+191,14
@@
static __init void reserve_regions(void)
paddr = md->phys_addr;
npages = md->num_pages;
paddr = md->phys_addr;
npages = md->num_pages;
+ resv = is_reserve_region(md);
if (efi_enabled(EFI_DBG)) {
char buf[64];
if (efi_enabled(EFI_DBG)) {
char buf[64];
- pr_info(" 0x%012llx-0x%012llx %s",
+ pr_info(" 0x%012llx-0x%012llx %s
%s\n
",
paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1,
- efi_md_typeattr_format(buf, sizeof(buf), md));
+ efi_md_typeattr_format(buf, sizeof(buf), md),
+ resv ? "*" : "");
}
memrange_efi_to_native(&paddr, &npages);
}
memrange_efi_to_native(&paddr, &npages);
@@
-204,14
+207,9
@@
static __init void reserve_regions(void)
if (is_normal_ram(md))
early_init_dt_add_memory_arch(paddr, size);
if (is_normal_ram(md))
early_init_dt_add_memory_arch(paddr, size);
- if (
is_reserve_region(md)) {
+ if (
resv)
memblock_mark_nomap(paddr, size);
memblock_mark_nomap(paddr, size);
- if (efi_enabled(EFI_DBG))
- pr_cont("*");
- }
- if (efi_enabled(EFI_DBG))
- pr_cont("\n");
}
set_bit(EFI_MEMMAP, &efi.flags);
}
set_bit(EFI_MEMMAP, &efi.flags);