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 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
firmware
/
memmap.c
diff --git
a/drivers/firmware/memmap.c
b/drivers/firmware/memmap.c
index
e2e04b0
..
17cf96c
100644
(file)
--- a/
drivers/firmware/memmap.c
+++ b/
drivers/firmware/memmap.c
@@
-324,7
+324,7
@@
int __init firmware_map_add_early(u64 start, u64 end, const char *type)
{
struct firmware_map_entry *entry;
- entry =
alloc_bootmem(sizeof(struct firmware_map_entry)
);
+ entry =
memblock_virt_alloc(sizeof(struct firmware_map_entry), 0
);
if (WARN_ON(!entry))
return -ENOMEM;