diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-18 18:03:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-18 18:03:54 +1100 |
| commit | 4fbf24a2c4cf796c5c9798942c8ffb70f2c46feb (patch) | |
| tree | 8a98d272489a5c9bcb7fe7917be16e8db2733ff2 /drivers/firmware/memmap.c | |
| parent | 521ffb22b5e3eefc5f4a44d540acf746d6233cde (diff) | |
| parent | f6ddb26d1da272ebfc386f2b6e9dc354f94117c0 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/firmware/memmap.c')
| -rw-r--r-- | drivers/firmware/memmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index ec4fd253a4e9..d168c87c7d30 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c @@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type) { struct firmware_map_entry *entry; - entry = memblock_alloc_nopanic(sizeof(struct firmware_map_entry), + entry = memblock_alloc(sizeof(struct firmware_map_entry), SMP_CACHE_BYTES); if (WARN_ON(!entry)) return -ENOMEM; |