Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2018-04-06 21:31:05 +0200
committerMichal Hocko <mhocko@suse.com>2018-04-06 21:31:05 +0200
commite27fb28d39d543ea9fb5f99915d725b19bbc9736 (patch)
treef402a6937e12788419f426c566c2b038f3db8fff
parentaeb02a3a58507d5486c24ddffad5ff7d9d488415 (diff)
parent5ded9b20373bafb66d1f841fcbbf0e8905cc1e99 (diff)
Merge branch 'users/mhocko/SLE15/bnc1082184' into users/mhocko/SLE15/for-next
-rw-r--r--mm/sparse-vmemmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index 6e36b3d27788..9a26a4732228 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -52,7 +52,7 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
{
/* If the main allocator is up use that, fallback to bootmem. */
if (slab_is_available()) {
- gfp_t gfp_mask = GFP_KERNEL|__GFP_REPEAT |__GFP_NOWARN;
+ gfp_t gfp_mask = GFP_KERNEL|__GFP_REPEAT |__GFP_NOWARN|__GFP_ZERO;
int order = get_order(size);
static bool warned;
struct page *page;