From patchwork Thu Jun 13 08:57:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 2715271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 01AB0C1459 for ; Thu, 13 Jun 2013 09:52:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B17F920166 for ; Thu, 13 Jun 2013 09:52:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DABC20161 for ; Thu, 13 Jun 2013 09:52:04 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Un3jH-0007nA-7h; Thu, 13 Jun 2013 09:22:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Un3iF-0006zA-98; Thu, 13 Jun 2013 09:20:59 +0000 Received: from mail-db9lp0251.outbound.messaging.microsoft.com ([213.199.154.251] helo=db9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Un3iB-0006yU-TQ for linux-arm-kernel@lists.infradead.org; Thu, 13 Jun 2013 09:20:56 +0000 Received: from mail146-db9-R.bigfish.com (10.174.16.238) by DB9EHSOBE024.bigfish.com (10.174.14.87) with Microsoft SMTP Server id 14.1.225.23; Thu, 13 Jun 2013 09:20:34 +0000 Received: from mail146-db9 (localhost [127.0.0.1]) by mail146-db9-R.bigfish.com (Postfix) with ESMTP id E4E172400F0; Thu, 13 Jun 2013 09:20:33 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6h1082kzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail146-db9 (localhost.localdomain [127.0.0.1]) by mail146-db9 (MessageSwitch) id 1371115231648591_26116; Thu, 13 Jun 2013 09:20:31 +0000 (UTC) Received: from DB9EHSMHS007.bigfish.com (unknown [10.174.16.251]) by mail146-db9.bigfish.com (Postfix) with ESMTP id 9971712004B; Thu, 13 Jun 2013 09:20:31 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB9EHSMHS007.bigfish.com (10.174.14.17) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 13 Jun 2013 09:20:29 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Thu, 13 Jun 2013 09:20:22 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r5D9J7hM023978; Thu, 13 Jun 2013 02:20:20 -0700 From: Huang Shijie To: Subject: [PATCH 2/2] ARM: mm: dump the memblock info in the later place Date: Thu, 13 Jun 2013 16:57:06 +0800 Message-ID: <1371113826-1231-2-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1371113826-1231-1-git-send-email-b32955@freescale.com> References: <1371113826-1231-1-git-send-email-b32955@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130613_052056_094506_32FD6D69 X-CRM114-Status: GOOD ( 11.24 ) X-Spam-Score: -1.9 (-) Cc: Huang Shijie , will.deacon@arm.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current code calls the memblock_dump_all() in the arm_memblock_init(), but it will dump out uncorrect memblock information. So we move it to paging_init() where we will not allocate memory from the memblock any more. Signed-off-by: Huang Shijie --- arch/arm/mm/init.c | 1 - arch/arm/mm/mmu.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 59c18b8..c99b543 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -384,7 +384,6 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) arm_memblock_steal_permitted = false; memblock_allow_resize(); - memblock_dump_all(); } void __init bootmem_init(void) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 56d1a22..70ad181 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1332,6 +1332,8 @@ void __init paging_init(struct machine_desc *mdesc) bootmem_init(); + memblock_dump_all(); + empty_zero_page = virt_to_page(zero_page); __flush_dcache_page(NULL, empty_zero_page); }