diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-24 00:26:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-24 00:51:33 +0200 |
| commit | 1602f49b58abcb0d34a5f0a29d68e7c1769547aa (patch) | |
| tree | 4848fb0ffbc581ff465fd9c9e5a5b10b06f09b68 /drivers/firmware | |
| parent | Merge branch 'geneve-vxlan-deps' (diff) | |
| parent | Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abello... (diff) | |
| download | linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.tar.xz linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.
In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efi/arm-init.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index aa1f743152a2..8714f8c271ba 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -203,7 +203,19 @@ void __init efi_init(void) reserve_regions(); early_memunmap(memmap.map, params.mmap_size); - memblock_mark_nomap(params.mmap & PAGE_MASK, - PAGE_ALIGN(params.mmap_size + - (params.mmap & ~PAGE_MASK))); + + if (IS_ENABLED(CONFIG_ARM)) { + /* + * 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))); + } } |