|
@@ -2680,7 +2680,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
|
|
|
struct zoneref *z;
|
|
|
struct page *page = NULL;
|
|
|
struct zone *zone;
|
|
|
- int nr_fair_skipped = 0;
|
|
|
+ bool fair_skipped;
|
|
|
bool zonelist_rescan;
|
|
|
|
|
|
zonelist_scan:
|
|
@@ -2708,7 +2708,7 @@ zonelist_scan:
|
|
|
if (!zone_local(ac->preferred_zone, zone))
|
|
|
break;
|
|
|
if (test_bit(ZONE_FAIR_DEPLETED, &zone->flags)) {
|
|
|
- nr_fair_skipped++;
|
|
|
+ fair_skipped = true;
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
@@ -2801,7 +2801,7 @@ try_this_zone:
|
|
|
*/
|
|
|
if (alloc_flags & ALLOC_FAIR) {
|
|
|
alloc_flags &= ~ALLOC_FAIR;
|
|
|
- if (nr_fair_skipped) {
|
|
|
+ if (fair_skipped) {
|
|
|
zonelist_rescan = true;
|
|
|
reset_alloc_batches(ac->preferred_zone);
|
|
|
}
|