|
@@ -1280,7 +1280,6 @@ static enum compact_result __compact_finished(struct zone *zone, struct compact_
|
|
const int migratetype)
|
|
const int migratetype)
|
|
{
|
|
{
|
|
unsigned int order;
|
|
unsigned int order;
|
|
- unsigned long watermark;
|
|
|
|
|
|
|
|
if (cc->contended || fatal_signal_pending(current))
|
|
if (cc->contended || fatal_signal_pending(current))
|
|
return COMPACT_CONTENDED;
|
|
return COMPACT_CONTENDED;
|
|
@@ -1308,13 +1307,6 @@ static enum compact_result __compact_finished(struct zone *zone, struct compact_
|
|
if (is_via_compact_memory(cc->order))
|
|
if (is_via_compact_memory(cc->order))
|
|
return COMPACT_CONTINUE;
|
|
return COMPACT_CONTINUE;
|
|
|
|
|
|
- /* Compaction run is not finished if the watermark is not met */
|
|
|
|
- watermark = zone->watermark[cc->alloc_flags & ALLOC_WMARK_MASK];
|
|
|
|
-
|
|
|
|
- if (!zone_watermark_ok(zone, cc->order, watermark, cc->classzone_idx,
|
|
|
|
- cc->alloc_flags))
|
|
|
|
- return COMPACT_CONTINUE;
|
|
|
|
-
|
|
|
|
/* Direct compactor: Is a suitable page free? */
|
|
/* Direct compactor: Is a suitable page free? */
|
|
for (order = cc->order; order < MAX_ORDER; order++) {
|
|
for (order = cc->order; order < MAX_ORDER; order++) {
|
|
struct free_area *area = &zone->free_area[order];
|
|
struct free_area *area = &zone->free_area[order];
|