diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
| commit | 59e35359ec360b74e9013ccab84c19ce53db38f9 (patch) | |
| tree | f6c5cca3189d2140f23e7a71ee3f167c7e6f748e /mm/page_alloc.c | |
| parent | c210bc406de6a7993b8d7f30c28436be80de7694 (diff) | |
| parent | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.02-android
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 692c0377ac77..15d86c744f97 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2473,9 +2473,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; @@ -2487,6 +2484,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; } |