Merge branch 'drm-fixes-5.1' of git://people.freedesktop.org/~agd5f/linux into drm...

[thirdparty/kernel/linux.git] / mm / page_ext.c

diff --git a/mm/page_ext.c b/mm/page_ext.c
index ab4244920e0f83ac71134d9a3de2c9b2888faaea..d8f1aca4ad43696aa8f368c335a04c69918b77ef 100644 (file)
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -161,7 +161,7 @@ static int __init alloc_node_page_ext(int nid)
 
        table_size = get_entry_size() * nr_pages;
 
-       base = memblock_alloc_try_nid_nopanic(
+       base = memblock_alloc_try_nid(
                        table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS),
                        MEMBLOCK_ALLOC_ACCESSIBLE, nid);
        if (!base)