2 files changed, 4 insertions, 2 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 3459e70eed72..8870d6ba64bf 100644
--- a/arch/sh/kernel/setup.c
+++ b/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/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
index 422e92721878..961b34085e3b 100644
--- a/arch/sh/mm/numa.c
+++ b/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);