Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760703AbaGRILq (ORCPT ); Fri, 18 Jul 2014 04:11:46 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:42573 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753577AbaGRIKO (ORCPT ); Fri, 18 Jul 2014 04:10:14 -0400 From: Wang Nan To: Ingo Molnar , Yinghai Lu , "Mel Gorman" , Andrew Morton CC: Pei Feiyue , , , , , , Subject: [PATCH 3/5] memory-hotplug: ia64: suitable memory should go to ZONE_MOVABLE Date: Fri, 18 Jul 2014 15:56:01 +0800 Message-ID: <1405670163-53747-4-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> References: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch add new memory to ZONE_MOVABLE if movable zone is setup and lower than newly added memory for ia64. Signed-off-by: Wang Nan --- arch/ia64/mm/init.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 25c3502..d81c916 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -625,6 +625,7 @@ int arch_add_memory(int nid, u64 start, u64 size) { pg_data_t *pgdat; struct zone *zone; + struct zone *movable_zone; unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; int ret; @@ -632,6 +633,12 @@ int arch_add_memory(int nid, u64 start, u64 size) pgdat = NODE_DATA(nid); zone = pgdat->node_zones + ZONE_NORMAL; + movable_zone = pgdat->node_zones + ZONE_MOVABLE; + if (!zone_is_empty(movable_zone)) + if (zone_spans_pfn(movable_zone, start_pfn) || + (zone_end_pfn(movable_zone) <= start_pfn)) + zone = movable_zone; + ret = __add_pages(nid, zone, start_pfn, nr_pages); if (ret) -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/