X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Fmemory_hotplug.c;h=b58906b6215cbb3d2b43abbcdb758e0809c42c7f;hb=f887c21e214757e6b1b9dd65e396ee3e7cbb6b18;hp=41266dc29f33fb1278d7e4e9d6fd2efab69380a1;hpb=5cae6fe27a1dc4053ae2f8f52ef1ef2ca860bbfb;p=cascardo%2Flinux.git diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 41266dc29f33..b58906b6215c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1567,7 +1567,9 @@ static struct page *new_node_page(struct page *page, unsigned long private, return alloc_huge_page_node(page_hstate(compound_head(page)), next_node_in(nid, nmask)); - node_clear(nid, nmask); + if (nid != next_node_in(nid, nmask)) + node_clear(nid, nmask); + if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE)) gfp_mask |= __GFP_HIGHMEM;