diff options
author | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
commit | 8ad23d861c38c89cb1a16d611b4f5a3c920b1a73 (patch) | |
tree | f97a38a313419a12793ae074a2d585bad576043c /mm | |
parent | e96c5550070c189a8ccb26dc6eae76ee8eef833d (diff) | |
parent | d6bc7e610ab98da569362b0b64bb20dafee1fcb9 (diff) |
Merge tag 'v4.4.140' into linux-linaro-lsk-v4.4
This is the 4.4.140 stable release
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 1 | ||||
-rw-r--r-- | mm/page_alloc.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7294301d8495..a813b03021b7 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2038,6 +2038,7 @@ static void __init gather_bootmem_prealloc(void) */ if (hstate_is_gigantic(h)) adjust_managed_page_count(page, 1 << h->order); + cond_resched(); } } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ca6db068319c..bf2d9272b7ba 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3102,8 +3102,6 @@ retry: * the allocation is high priority and these type of * allocations are system rather than user orientated */ - ac->zonelist = node_zonelist(numa_node_id(), gfp_mask); - page = __alloc_pages_high_priority(gfp_mask, order, ac); if (page) { |