| Message ID | 1348224383-1499-3-git-send-email-mgorman@suse.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Sep 21, 2012 at 11:46:16AM +0100, Mel Gorman wrote: > 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> Acked-by: Rafael Aquini <aquini@redhat.com>
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; }
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(-)