From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756894AbaE2GWr (ORCPT ); Thu, 29 May 2014 02:22:47 -0400 Received: from lgeamrelo04.lge.com ([156.147.1.127]:43247 "EHLO lgeamrelo04.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756277AbaE2GWq (ORCPT ); Thu, 29 May 2014 02:22:46 -0400 X-Original-SENDERIP: 10.177.220.145 X-Original-MAILFROM: iamjoonsoo.kim@lge.com From: Joonsoo Kim To: Andrew Morton Cc: David Rientjes , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Marek Szyprowski , Michal Nazarewicz , "Aneesh Kumar K.V" , Joonsoo Kim Subject: [PATCH] CMA: use MIGRATE_SYNC in alloc_contig_range() Date: Thu, 29 May 2014 15:25:50 +0900 Message-Id: <1401344750-3684-1-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before commit 'mm, compaction: embed migration mode in compact_control' from David is merged, alloc_contig_range() used sync migration, instead of sync_light migration. This doesn't break anything currently because page isolation doesn't have any difference with sync and sync_light, but it could in the future, so change back as it was. And pass cc->mode to migrate_pages(), instead of passing MIGRATE_SYNC to migrate_pages(). Signed-off-by: Joonsoo Kim diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7f97767..97c4185 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6262,7 +6262,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, cc->nr_migratepages -= nr_reclaimed; ret = migrate_pages(&cc->migratepages, alloc_migrate_target, - NULL, 0, MIGRATE_SYNC, MR_CMA); + NULL, 0, cc->mode, MR_CMA); } if (ret < 0) { putback_movable_pages(&cc->migratepages); @@ -6301,7 +6301,7 @@ int alloc_contig_range(unsigned long start, unsigned long end, .nr_migratepages = 0, .order = -1, .zone = page_zone(pfn_to_page(start)), - .mode = MIGRATE_SYNC_LIGHT, + .mode = MIGRATE_SYNC, .ignore_skip_hint = true, }; INIT_LIST_HEAD(&cc.migratepages); -- 1.7.9.5