1 files changed, 8 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ec250453f5e8..11a5f50efd97 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6431,10 +6431,14 @@ static void __ref setup_usemap(struct pglist_data *pgdat,
 {
         unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize);
         zone->pageblock_flags = NULL;
-        if (usemapsize)
+        if (usemapsize) {
                 zone->pageblock_flags =
                         memblock_alloc_node_nopanic(usemapsize,
                                                          pgdat->node_id);
+                if (!zone->pageblock_flags)
+                        panic("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n",
+                              usemapsize, zone->name, pgdat->node_id);
+        }
 }
 #else
 static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
@@ -6664,6 +6668,9 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)
                 end = ALIGN(end, MAX_ORDER_NR_PAGES);
                 size =  (end - start) * sizeof(struct page);
                 map = memblock_alloc_node_nopanic(size, pgdat->node_id);
+                if (!map)
+                        panic("Failed to allocate %ld bytes for node %d memory map\n",
+                              size, pgdat->node_id);
                 pgdat->node_mem_map = map + offset;
         }
         pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n",