| Message ID | 1405914402-66212-5-git-send-email-wangnan0@huawei.com |
|---|---|
| State | Accepted |
| Commit | ed562ae6d76dbe409dddedefc94a54673623dcb5 |
| Headers | show
Return-Path: <patchwork-forward+bncBD2YXXXCQEBBBG5AWKPAKGQEECHE5QY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E960120492 for <linaro@patches.linaro.org>; Mon, 21 Jul 2014 03:59:23 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id j7sf18202853qaq.5 for <linaro@patches.linaro.org>; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=LE1ECfpWXGKzA4xkQVuNbJJNqhUdUeRV0D02e8xypAY=; b=P2CoGrHM51yj/weJtsZkvnjN86ofZvh+V+TyFZJZl7zwVZitu8xpTIobL4VswiFOkN ScqXSsrNz2onFJ/dbDGYfDIzA5oQgeuj+pH4mlun9yRuJxyoSUQ1DRxssMe13ciKZtuQ eBZIT9r5tMVRqOkYcI3z4vBh1cY/+pMpl/dCYk4PGQUiHBlVsnoBtctk/4iXuchHyR4u n+ZLy5zbKMlX7JABjjGnme+uDp3peLW4XM7xRKLPQ9LsSVj6/AFLcSgZOmZKZ+MWDksx URFwNfCM+Tt5MEMg3i8aTWVDoE1yimbqln0wxpxA+eRiBNlrEhteYFyG/KOWFhjCbOJN DZ9g== X-Gm-Message-State: ALoCoQm6S2DuwSx4lP+G42W286/TOEJUtjTwiPn7zFyIFEShWmOkz3dSIkQfaGvS5WPY+MXHXZk+ X-Received: by 10.236.164.106 with SMTP id b70mr9524975yhl.1.1405915163706; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.213 with SMTP id n79ls1821458qgd.29.gmail; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-Received: by 10.220.3.79 with SMTP id 15mr842852vcm.63.1405915163641; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id fb1si6395602vdb.54.2014.07.20.20.59.23 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Jul 2014 20:59:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so11118025vcb.11 for <patchwork-forward@linaro.org>; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-Received: by 10.220.164.198 with SMTP id f6mr8427088vcy.51.1405915163556; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp80049vcb; Sun, 20 Jul 2014 20:59:23 -0700 (PDT) X-Received: by 10.68.129.99 with SMTP id nv3mr949755pbb.128.1405915162731; Sun, 20 Jul 2014 20:59:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id df3si12867006pbc.99.2014.07.20.20.59.22; Sun, 20 Jul 2014 20:59:22 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752765AbaGUD5F (ORCPT <rfc822;yi.li@linaro.org> + 9 others); Sun, 20 Jul 2014 23:57:05 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:25255 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbaGUD46 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 20 Jul 2014 23:56:58 -0400 Received: from 172.24.2.119 (EHLO lggeml420-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BYZ66475; Mon, 21 Jul 2014 11:56:46 +0800 (CST) Received: from kernel-host.huawei (10.107.197.247) by lggeml420-hub.china.huawei.com (10.72.61.115) with Microsoft SMTP Server id 14.3.158.1; Mon, 21 Jul 2014 11:56:34 +0800 From: Wang Nan <wangnan0@huawei.com> To: Ingo Molnar <mingo@redhat.com>, Yinghai Lu <yinghai@kernel.org>, "Mel Gorman" <mgorman@suse.de>, Andrew Morton <akpm@linux-foundation.org>, "Dave Hansen" <dave.hansen@intel.com>, Zhang Yanfei <zhangyanfei@cn.fujitsu.com> CC: <peifeiyue@huawei.com>, <linux-mm@kvack.org>, <x86@kernel.org>, <linux-ia64@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org>, <linux-sh@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <wangnan0@huawei.com> Subject: [PATCH v2 4/7] memory-hotplug: ia64: suitable memory should go to ZONE_MOVABLE Date: Mon, 21 Jul 2014 11:46:39 +0800 Message-ID: <1405914402-66212-5-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1405914402-66212-1-git-send-email-wangnan0@huawei.com> References: <1405914402-66212-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.197.247] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> Content-Type: text/plain |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 25c3502..892d43e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -631,7 +631,8 @@ int arch_add_memory(int nid, u64 start, u64 size) pgdat = NODE_DATA(nid); - zone = pgdat->node_zones + ZONE_NORMAL; + zone = pgdat->node_zones + + zone_for_memory(nid, start, size, ZONE_NORMAL); ret = __add_pages(nid, zone, start_pfn, nr_pages); if (ret)
This patch introduces zone_for_memory() to arch_add_memory() on ia64 to ensure new, higher memory added into ZONE_MOVABLE if movable zone has already setup. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Cc: Dave Hansen <dave.hansen@intel.com> --- arch/ia64/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)