Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-04-07 00:23:44 +0200
committerJiri Kosina <jkosina@suse.cz>2018-04-07 00:23:44 +0200
commitb417232009b8aa27dd84b4bada3519f85524ae6a (patch)
tree67ddb9765a7b1af9a620dbe313d6b71d21c5146f
parent64a5fd7170c663d822bd5c842b8d350cf79e77c8 (diff)
parente27fb28d39d543ea9fb5f99915d725b19bbc9736 (diff)
Merge remote-tracking branch 'origin/users/mhocko/SLE15/for-next' into SLE15rpm-4.12.14-16--SLE-15-Packages-RC3rpm-4.12.14-16
Pull hotplug fix from Michal Hocko suse-commit: 6f854dbebbad5f43c079e14be17015eb2fad69bf
-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;