linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: mm: dump the memblock info in the later place
Date: Thu, 13 Jun 2013 16:57:06 +0800	[thread overview]
Message-ID: <1371113826-1231-2-git-send-email-b32955@freescale.com> (raw)
In-Reply-To: <1371113826-1231-1-git-send-email-b32955@freescale.com>

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 <b32955@freescale.com>
---
 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);
 }
-- 
1.7.1

  reply	other threads:[~2013-06-13  8:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-13  8:57 [PATCH 1/2] ARM: mmu: fix the hang when we steal a section unaligned size memory Huang Shijie
2013-06-13  8:57 ` Huang Shijie [this message]
2013-06-17  2:44 ` Huang Shijie
2013-06-18 15:29 ` Will Deacon
2013-06-18 16:52   ` Russell King - ARM Linux
2013-06-19  2:36     ` Huang Shijie
2013-06-19  8:28       ` Russell King - ARM Linux
2013-06-19  8:47         ` Huang Shijie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371113826-1231-2-git-send-email-b32955@freescale.com \
    --to=b32955@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).