ARM: Move platform memory reservations out of generic code

[net-next-2.6.git] / arch / arm / mm / nommu.c

diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 33b327379f0756e14eff3d9f0cd23a2f022eb112..ed58ddbbc5b30cd4afaa990c98be33101509ba20 100644 (file)
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -18,20 +18,18 @@
 #include "mm.h"
 
 /*
- * Reserve the various regions of node 0
+ * Reserve the various regions
  */
-void __init reserve_node_zero(pg_data_t *pgdat)
+void __init reserve_special_regions(void)
 {
        /*
         * Register the kernel text and data with bootmem.
         * Note that this can only be in node 0.
         */
 #ifdef CONFIG_XIP_KERNEL
-       reserve_bootmem_node(pgdat, __pa(_data), _end - _data,
-                       BOOTMEM_DEFAULT);
+       reserve_bootmem(__pa(_data), _end - _data, BOOTMEM_DEFAULT);
 #else
-       reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext,
-                       BOOTMEM_DEFAULT);
+       reserve_bootmem(__pa(_stext), _end - _stext, BOOTMEM_DEFAULT);
 #endif
 
        /*
@@ -39,8 +37,7 @@ void __init reserve_node_zero(pg_data_t *pgdat)
         * some architectures which the DRAM is the exception vector to trap,
         * alloc_page breaks with error, although it is not NULL, but "0."
         */
-       reserve_bootmem_node(pgdat, CONFIG_VECTORS_BASE, PAGE_SIZE,
-                       BOOTMEM_DEFAULT);
+       reserve_bootmem(CONFIG_VECTORS_BASE, PAGE_SIZE, BOOTMEM_DEFAULT);
 }
 
 /*
@@ -49,7 +46,7 @@ void __init reserve_node_zero(pg_data_t *pgdat)
  */
 void __init paging_init(struct machine_desc *mdesc)
 {
-       bootmem_init();
+       bootmem_init(mdesc);
 }
 
 /*