memblock: drop memblock_alloc_*_nopanic() variants

[linux-2.6-microblaze.git] / arch / x86 / mm / kasan_init_64.c

diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 462fde8..8dc0fc0 100644 (file)
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -24,14 +24,16 @@ extern struct range pfn_mapped[E820_MAX_ENTRIES];
 
 static p4d_t tmp_p4d_table[MAX_PTRS_PER_P4D] __initdata __aligned(PAGE_SIZE);
 
-static __init void *early_alloc(size_t size, int nid, bool panic)
+static __init void *early_alloc(size_t size, int nid, bool should_panic)
 {
-       if (panic)
-               return memblock_alloc_try_nid(size, size,
-                       __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
-       else
-               return memblock_alloc_try_nid_nopanic(size, size,
+       void *ptr = memblock_alloc_try_nid(size, size,
                        __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
+
+       if (!ptr && should_panic)
+               panic("%pS: Failed to allocate page, nid=%d from=%lx\n",
+                     (void *)_RET_IP_, nid, __pa(MAX_DMA_ADDRESS));
+
+       return ptr;
 }
 
 static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr,