Merge 5.4-rc4 into android-mainline
Linux 5.4-rc4 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I0edccd72fad8b6443b24c8c1005b66d6b8f532ce
This commit is contained in:
@@ -4485,12 +4485,14 @@ retry_cpuset:
|
||||
if (page)
|
||||
goto got_pg;
|
||||
|
||||
if (order >= pageblock_order && (gfp_mask & __GFP_IO)) {
|
||||
if (order >= pageblock_order && (gfp_mask & __GFP_IO) &&
|
||||
!(gfp_mask & __GFP_RETRY_MAYFAIL)) {
|
||||
/*
|
||||
* If allocating entire pageblock(s) and compaction
|
||||
* failed because all zones are below low watermarks
|
||||
* or is prohibited because it recently failed at this
|
||||
* order, fail immediately.
|
||||
* order, fail immediately unless the allocator has
|
||||
* requested compaction and reclaim retry.
|
||||
*
|
||||
* Reclaim is
|
||||
* - potentially very expensive because zones are far
|
||||
|
Reference in New Issue
Block a user