dt-bindings: clock: milbeaut: add Milbeaut clock description

[linux.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3eb01dedfb5059ac59d8825c6f6eb18c11720a2c..03fcf73d47dabde0987f3542c3c87fca33bf5a5d 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6445,8 +6445,8 @@ static void __ref setup_usemap(struct pglist_data *pgdat,
        zone->pageblock_flags = NULL;
        if (usemapsize) {
                zone->pageblock_flags =
-                       memblock_alloc_node_nopanic(usemapsize,
-                                                        pgdat->node_id);
+                       memblock_alloc_node(usemapsize, SMP_CACHE_BYTES,
+                                           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);
@@ -6679,7 +6679,8 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)
                end = pgdat_end_pfn(pgdat);
                end = ALIGN(end, MAX_ORDER_NR_PAGES);
                size =  (end - start) * sizeof(struct page);
-               map = memblock_alloc_node_nopanic(size, pgdat->node_id);
+               map = memblock_alloc_node(size, SMP_CACHE_BYTES,
+                                         pgdat->node_id);
                if (!map)
                        panic("Failed to allocate %ld bytes for node %d memory map\n",
                              size, pgdat->node_id);
@@ -7959,8 +7960,7 @@ void *__init alloc_large_system_hash(const char *tablename,
                size = bucketsize << log2qty;
                if (flags & HASH_EARLY) {
                        if (flags & HASH_ZERO)
-                               table = memblock_alloc_nopanic(size,
-                                                              SMP_CACHE_BYTES);
+                               table = memblock_alloc(size, SMP_CACHE_BYTES);
                        else
                                table = memblock_alloc_raw(size,
                                                           SMP_CACHE_BYTES);