Merge tag 'md/4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[mirror_ubuntu-bionic-kernel.git] / mm / page_ext.c

diff --git a/mm/page_ext.c b/mm/page_ext.c
index 88ccc044b09a41504fb212afdb5ca8a45e842998..32f18911dedabfa7fc0cda117686f582cc44ebe9 100644 (file)
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -222,10 +222,7 @@ static void *__meminit alloc_page_ext(size_t size, int nid)
                return addr;
        }
 
-       if (node_state(nid, N_HIGH_MEMORY))
-               addr = vzalloc_node(size, nid);
-       else
-               addr = vzalloc(size);
+       addr = vzalloc_node(size, nid);
 
        return addr;
 }
@@ -409,6 +406,7 @@ void __init page_ext_init(void)
                                continue;
                        if (init_section_page_ext(pfn, nid))
                                goto oom;
+                       cond_resched();
                }
        }
        hotplug_memory_notifier(page_ext_callback, 0);