Commit 05391772 authored by huang.zijiang's avatar huang.zijiang Committed by Linus Torvalds

drivers/firmware/memmap.c: modify memblock_alloc to memblock_alloc_nopanic

memblock_alloc() never returns NULL because panic never returns.

Link: default avatarhuang.zijiang <>
Acked-by: default avatarMike Rapoport <>
Cc: Michal Hocko <>
Cc: Stephen Rothwell <>
Cc: Michael Ellerman <>
Cc: Yi Wang <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 6862d2fc
...@@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type) ...@@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type)
{ {
struct firmware_map_entry *entry; struct firmware_map_entry *entry;
entry = memblock_alloc(sizeof(struct firmware_map_entry), entry = memblock_alloc_nopanic(sizeof(struct firmware_map_entry),
if (WARN_ON(!entry)) if (WARN_ON(!entry))
return -ENOMEM; return -ENOMEM;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment