diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
| commit | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (patch) | |
| tree | 4e99ec8bd3ce134bdbafd54a0fc873f11c33e21b /mm/page_alloc.c | |
| parent | 293c379504006b5ea8b4e7109ba4ebc3211f9b91 (diff) | |
| parent | 49fe90b853dfb1087d0a734cd7f4af1aa00c8e53 (diff) | |
Merge tag 'v4.4.114' into linux-linaro-lsk-v4.4lsk-v4.4-18.02
This is the 4.4.114 stable release
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 417700241e52..ca6db068319c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2461,9 +2461,6 @@ static bool __zone_watermark_ok(struct zone *z, unsigned int order, if (!area->nr_free) continue; - if (alloc_harder) - return true; - for (mt = 0; mt < MIGRATE_PCPTYPES; mt++) { if (!list_empty(&area->free_list[mt])) return true; @@ -2475,6 +2472,9 @@ static bool __zone_watermark_ok(struct zone *z, unsigned int order, return true; } #endif + if (alloc_harder && + !list_empty(&area->free_list[MIGRATE_HIGHATOMIC])) + return true; } return false; } |