diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
| commit | 241bca50dd1ae71a7cd7eebe579bd131bf986167 (patch) | |
| tree | f9d4af30aefba27b3c00074d935f8b5b01d54939 /mm/migrate.c | |
| parent | 1ebca975cbc0ab4708126e26bf2729777184f1e6 (diff) | |
| parent | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.03-android
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 2c37b1a44a8c..8c4841a6dc4c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1557,7 +1557,7 @@ static struct page *alloc_misplaced_dst_page(struct page *page, (GFP_HIGHUSER_MOVABLE | __GFP_THISNODE | __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN) & - ~GFP_IOFS, 0); + ~__GFP_WAIT, 0); return newpage; } |