From patchwork Mon Jul 21 03:46:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 33938 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B9EEF20492 for ; Mon, 21 Jul 2014 03:57:15 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf50092854pac.3 for ; Sun, 20 Jul 2014 20:57:15 -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=LOKdPsqKfRpyuArwHXqsu/WcrztLl0a7hVVvSXTjEIc=; b=C9WoHjdStyzpOSkZJp0K1NDOVsyxY4UJ5DZ6toNWeM4aVveiC4DSMQYk9crx/GD6qw 9Jh6BFXMpcDIoFNqq+NJENLDFRu3N5YOSBHd6rbNkpHgX29aySuZTux3hA1fUDvEKT7l i0fj7BgTYIs0e7YfND4YnCiCOd+gtiWBD0NU4iAEeBEck8DEvfBPJc+KcyHtlAAVnlWb /BRmeBm1Ho5wY1AIX/4tr01DGz5DvqIHf5BHYKBUEo8QjhfbOGjp3DG4I6li4HGyzfwg g8RMYor2fJIiR/jt5huVklVrcMXdtP+oVcKQPZg+8PNPncPC6oolUs2xAYXyFJSyXG48 OlOg== X-Gm-Message-State: ALoCoQnVBJ52DcsWmaRaQgKNwKGUGDQ7RiXs4o8ySouZSLTCLCzeDoVm3PzYSHybALhDVDfVe7Mm X-Received: by 10.70.24.163 with SMTP id v3mr11183765pdf.8.1405915035030; Sun, 20 Jul 2014 20:57:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.37 with SMTP id o34ls1621545qgo.67.gmail; Sun, 20 Jul 2014 20:57:14 -0700 (PDT) X-Received: by 10.52.119.196 with SMTP id kw4mr707577vdb.75.1405915034876; Sun, 20 Jul 2014 20:57:14 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id p18si10638838vcf.70.2014.07.20.20.57.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Jul 2014 20:57:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so11373136vcb.13 for ; Sun, 20 Jul 2014 20:57:14 -0700 (PDT) X-Received: by 10.52.164.11 with SMTP id ym11mr739020vdb.74.1405915034765; Sun, 20 Jul 2014 20:57:14 -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 tc5csp79972vcb; Sun, 20 Jul 2014 20:57:14 -0700 (PDT) X-Received: by 10.70.128.140 with SMTP id no12mr475635pdb.147.1405915033842; Sun, 20 Jul 2014 20:57:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fl5si12833911pbb.220.2014.07.20.20.57.13; Sun, 20 Jul 2014 20:57:13 -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 S1752796AbaGUD5G (ORCPT + 9 others); Sun, 20 Jul 2014 23:57:06 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:25253 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053AbaGUD46 (ORCPT ); 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 BYZ66465; Mon, 21 Jul 2014 11:56:45 +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:33 +0800 From: Wang Nan To: Ingo Molnar , Yinghai Lu , "Mel Gorman" , Andrew Morton , "Dave Hansen" , Zhang Yanfei CC: , , , , , , , Subject: [PATCH v2 3/7] memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE Date: Mon, 21 Jul 2014 11:46:38 +0800 Message-ID: <1405914402-66212-4-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: 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.182 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: , List-Help: , List-Archive: List-Unsubscribe: , This patch introduces zone_for_memory() to arch_add_memory() on x86_32 to ensure new, higher memory added into ZONE_MOVABLE if movable zone has already setup. Signed-off-by: Wang Nan Cc: Zhang Yanfei Cc: Dave Hansen --- arch/x86/mm/init_32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index e395048..7d05565 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -825,7 +825,8 @@ void __init mem_init(void) int arch_add_memory(int nid, u64 start, u64 size) { struct pglist_data *pgdata = NODE_DATA(nid); - struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; + struct zone *zone = pgdata->node_zones + + zone_for_memory(nid, start, size, ZONE_HIGHMEM); unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT;