[PATCH 2/9] Revert... | linux-mm

[PATCH 0/9] Reduce compaction scanning and lock contention · Mel Gorman <mgorman@suse.de> · 2012-09-21
[PATCH 1/9] Revert "mm: compaction: check lock contention first before taking lock" · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 1/9] Revert "mm: compaction: check lock contention first before taking lock" · Rafael Aquini <hidden> · 2012-09-21
[PATCH 3/9] Revert "mm: compaction: abort compaction loop if lock is contended or run too long" · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 3/9] Revert "mm: compaction: abort compaction loop if lock is contended or run too long" · Rafael Aquini <hidden> · 2012-09-21
[PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Minchan Kim <minchan@kernel.org> · 2012-09-25
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Mel Gorman <mgorman@suse.de> · 2012-09-25
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Minchan Kim <minchan@kernel.org> · 2012-09-25
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Andrew Morton <akpm@linux-foundation.org> · 2012-09-25
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Minchan Kim <minchan@kernel.org> · 2012-09-26
Re: [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible · Mel Gorman <mgorman@suse.de> · 2012-09-26
[PATCH 4/9] mm: compaction: Abort compaction loop if lock is contended or run too long · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 4/9] mm: compaction: Abort compaction loop if lock is contended or run too long · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 4/9] mm: compaction: Abort compaction loop if lock is contended or run too long · Andrew Morton <akpm@linux-foundation.org> · 2012-09-21
Re: [PATCH 4/9] mm: compaction: Abort compaction loop if lock is contended or run too long · Minchan Kim <minchan@kernel.org> · 2012-09-25
[PATCH 7/9] Revert "mm: have order > 0 compaction start off where it left" · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 7/9] Revert "mm: have order > 0 compaction start off where it left" · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 7/9] Revert "mm: have order > 0 compaction start off where it left" · Minchan Kim <minchan@kernel.org> · 2012-09-25
[PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Andrew Morton <akpm@linux-foundation.org> · 2012-09-21
Re: [PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Mel Gorman <mgorman@suse.de> · 2012-09-24
Re: [PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Minchan Kim <minchan@kernel.org> · 2012-09-25
Re: [PATCH 6/9] mm: compaction: Acquire the zone->lock as late as possible · Minchan Kim <minchan@kernel.org> · 2012-09-25
[PATCH 9/9] mm: compaction: Restart compaction from near where it left off · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 9/9] mm: compaction: Restart compaction from near where it left off · Rafael Aquini <hidden> · 2012-09-21
[PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Andrew Morton <akpm@linux-foundation.org> · 2012-09-21
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Mel Gorman <mgorman@suse.de> · 2012-09-24
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Andrew Morton <akpm@linux-foundation.org> · 2012-09-24
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Mel Gorman <mgorman@suse.de> · 2012-09-25
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Andrew Morton <akpm@linux-foundation.org> · 2012-09-25
[PATCH] mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2 · Mel Gorman <mgorman@suse.de> · 2012-09-27
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Mel Gorman <mgorman@suse.de> · 2012-09-27
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Minchan Kim <minchan@kernel.org> · 2012-09-26
Re: [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated · Mel Gorman <mgorman@suse.de> · 2012-09-27
[PATCH 2/9] Revert "mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix" · Mel Gorman <mgorman@suse.de> · 2012-09-21
Re: [PATCH 2/9] Revert "mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix" · Rafael Aquini <hidden> · 2012-09-21
Re: [PATCH 0/9] Reduce compaction scanning and lock contention · Rik van Riel <hidden> · 2012-09-21

STALE5021d

Revisions (2)

2012-09-20 v1 [diff vs current]
2012-09-21 v1 current

[PATCH 2/9] Revert "mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix"

From: Mel Gorman <mgorman@suse.de>
Date: 2012-09-21 10:47:47
Also in: kvm, lkml, qemu-devel
Subsystem: memory management, memory management - page allocator, the rest · Maintainers: Andrew Morton, Vlastimil Babka, Linus Torvalds

This reverts
mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
as it is replaced by a later patch in the series.

Signed-off-by: Mel Gorman <mgorman@suse.de>
---
 mm/compaction.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index 4a77b4b..1c873bb 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c

@@ -907,7 +907,8 @@ static unsigned long compact_zone_order(struct zone *zone,
 	INIT_LIST_HEAD(&cc.migratepages);
 
 	ret = compact_zone(zone, &cc);
-	*contended = cc.contended;
+	if (contended)
+		*contended = cc.contended;
 	return ret;
 }

-- 
1.7.9.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help