[PATCH] mm: __alloc_pages cleanup
Clean up of __alloc_pages. Restoration of previous behaviour, plus further cleanups by introducing an 'alloc_flags', removing the last of should_reclaim_zone. Signed-off-by: Rohit Seth <rohit.seth@intel.com> Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
51c6f666fc
commit
7fb1d9fca5
@@ -1074,7 +1074,7 @@ loop_again:
|
||||
continue;
|
||||
|
||||
if (!zone_watermark_ok(zone, order,
|
||||
zone->pages_high, 0, 0, 0)) {
|
||||
zone->pages_high, 0, 0)) {
|
||||
end_zone = i;
|
||||
goto scan;
|
||||
}
|
||||
@@ -1111,7 +1111,7 @@ scan:
|
||||
|
||||
if (nr_pages == 0) { /* Not software suspend */
|
||||
if (!zone_watermark_ok(zone, order,
|
||||
zone->pages_high, end_zone, 0, 0))
|
||||
zone->pages_high, end_zone, 0))
|
||||
all_zones_ok = 0;
|
||||
}
|
||||
zone->temp_priority = priority;
|
||||
@@ -1259,7 +1259,7 @@ void wakeup_kswapd(struct zone *zone, int order)
|
||||
return;
|
||||
|
||||
pgdat = zone->zone_pgdat;
|
||||
if (zone_watermark_ok(zone, order, zone->pages_low, 0, 0, 0))
|
||||
if (zone_watermark_ok(zone, order, zone->pages_low, 0, 0))
|
||||
return;
|
||||
if (pgdat->kswapd_max_order < order)
|
||||
pgdat->kswapd_max_order = order;
|
||||
|
Reference in New Issue
Block a user