From 3a1392f9fe112f35fc43c7faf530a0c528cfc229 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 5 Jul 2011 19:58:29 +0100
Subject: [PATCH] --- yaml --- r: 254779 b: refs/heads/master c:
 0371d3f7e8f1cddaee1f215e42c09a40e235d810 h: refs/heads/master i:   254777:
 febc5533f66038b45d32d247df9b811dc8b9d117   254775:
 3b9db5ae8c3030c6b91a6a1db31accdd3ad79695 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/setup.c | 2 ++
 trunk/arch/arm/mm/mmu.c       | 5 +++--
 trunk/arch/arm/mm/nommu.c     | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7f42265735b2..ddbe57caa139 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f96521fab978046070a697926cf351c2c37af29
+refs/heads/master: 0371d3f7e8f1cddaee1f215e42c09a40e235d810
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index ed11fb08b05a..acbb447ac6b5 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -73,6 +73,7 @@ __setup("fpe=", fpe_setup);
 #endif
 
 extern void paging_init(struct machine_desc *desc);
+extern void sanity_check_meminfo(void);
 extern void reboot_setup(char *str);
 
 unsigned int processor_id;
@@ -900,6 +901,7 @@ void __init setup_arch(char **cmdline_p)
 
 	parse_early_param();
 
+	sanity_check_meminfo();
 	arm_memblock_init(&meminfo, mdesc);
 
 	paging_init(mdesc);
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c
index 9d9e736c2b4f..594d677b92c8 100644
--- a/trunk/arch/arm/mm/mmu.c
+++ b/trunk/arch/arm/mm/mmu.c
@@ -759,7 +759,7 @@ early_param("vmalloc", early_vmalloc);
 
 static phys_addr_t lowmem_limit __initdata = 0;
 
-static void __init sanity_check_meminfo(void)
+void __init sanity_check_meminfo(void)
 {
 	int i, j, highmem = 0;
 
@@ -1032,8 +1032,9 @@ void __init paging_init(struct machine_desc *mdesc)
 {
 	void *zero_page;
 
+	memblock_set_current_limit(lowmem_limit);
+
 	build_mem_type_table();
-	sanity_check_meminfo();
 	prepare_page_table();
 	map_lowmem();
 	devicemaps_init(mdesc);
diff --git a/trunk/arch/arm/mm/nommu.c b/trunk/arch/arm/mm/nommu.c
index 687d02319a41..941a98c9e8aa 100644
--- a/trunk/arch/arm/mm/nommu.c
+++ b/trunk/arch/arm/mm/nommu.c
@@ -27,6 +27,10 @@ void __init arm_mm_memblock_reserve(void)
 	memblock_reserve(CONFIG_VECTORS_BASE, PAGE_SIZE);
 }
 
+void __init sanity_check_meminfo(void)
+{
+}
+
 /*
  * paging_init() sets up the page tables, initialises the zone memory
  * maps, and sets up the zero page, bad page and bad page tables.