Merge tag 'pstore-v4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[linux.git] / drivers / firmware / memmap.c

diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 03cead6d5f9779fdf8413c01c888bd77a0bd5ce0..d168c87c7d3085655d1fd627a6b65b792129cb03 100644 (file)
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -19,7 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 
@@ -333,7 +333,8 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type)
 {
        struct firmware_map_entry *entry;
 
-       entry = memblock_alloc(sizeof(struct firmware_map_entry), 0);
+       entry = memblock_alloc(sizeof(struct firmware_map_entry),
+                              SMP_CACHE_BYTES);
        if (WARN_ON(!entry))
                return -ENOMEM;