From 8be335cf0a47fdf1ea834f8531e341743e2c19b9 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 3 Mar 2010 13:16:31 +0900
Subject: [PATCH] --- yaml --- r: 186493 b: refs/heads/master c:
 09e1172317d1038918c5a139ba31155610f802b5 h: refs/heads/master i:   186491:
 37dd8645fa82cddd231522a61d86a010a9707fc1 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/kernel/setup.c | 3 +--
 trunk/arch/sh/mm/numa.c      | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4565c5589981..ebe73ec38f45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1042aa248e4ea7f39d5ce13f080cbf3b6c42618
+refs/heads/master: 09e1172317d1038918c5a139ba31155610f802b5
diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c
index 3459e70eed72..8870d6ba64bf 100644
--- a/trunk/arch/sh/kernel/setup.c
+++ b/trunk/arch/sh/kernel/setup.c
@@ -443,7 +443,7 @@ void __init setup_arch(char **cmdline_p)
 
 	nodes_clear(node_online_map);
 
-	/* Setup bootmem with available RAM */
+	pmb_init();
 	lmb_init();
 	setup_memory();
 	sparse_init();
@@ -452,7 +452,6 @@ void __init setup_arch(char **cmdline_p)
 	conswitchp = &dummy_con;
 #endif
 	paging_init();
-	pmb_init();
 
 	ioremap_fixed_init();
 
diff --git a/trunk/arch/sh/mm/numa.c b/trunk/arch/sh/mm/numa.c
index 422e92721878..961b34085e3b 100644
--- a/trunk/arch/sh/mm/numa.c
+++ b/trunk/arch/sh/mm/numa.c
@@ -74,6 +74,9 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
 	start_pfn = start >> PAGE_SHIFT;
 	end_pfn = end >> PAGE_SHIFT;
 
+	pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
+			 PAGE_KERNEL);
+
 	lmb_add(start, end - start);
 
 	__add_active_range(nid, start_pfn, end_pfn);