MIPS: dec: fix section mismatch

[linux-2.6-microblaze.git] / arch / mips / dec / prom / memory.c

diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c
index 5073d2e..44490c3 100644 (file)
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -12,7 +12,6 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
-#include <asm/bootinfo.h>
 #include <asm/dec/machtype.h>
 #include <asm/dec/prom.h>
 #include <asm/page.h>
@@ -28,7 +27,7 @@ volatile unsigned long mem_err;               /* So we know an error occurred */
 
 #define CHUNK_SIZE 0x400000
 
-static inline void pmax_setup_memory_region(void)
+static __init void pmax_setup_memory_region(void)
 {
        volatile unsigned char *memory_page, dummy;
        char old_handler[0x80];
@@ -50,15 +49,14 @@ static inline void pmax_setup_memory_region(void)
        }
        memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
 
-       add_memory_region(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE,
-                         BOOT_MEM_RAM);
+       memblock_add(0, (unsigned long)memory_page - CKSEG1 - CHUNK_SIZE);
 }
 
 /*
  * Use the REX prom calls to get hold of the memory bitmap, and thence
  * determine memory size.
  */
-static inline void rex_setup_memory_region(void)
+static __init void rex_setup_memory_region(void)
 {
        int i, bitmap_size;
        unsigned long mem_start = 0, mem_size = 0;
@@ -76,13 +74,13 @@ static inline void rex_setup_memory_region(void)
                else if (!mem_size)
                        mem_start += (8 * bm->pagesize);
                else {
-                       add_memory_region(mem_start, mem_size, BOOT_MEM_RAM);
+                       memblock_add(mem_start, mem_size);
                        mem_start += mem_size + (8 * bm->pagesize);
                        mem_size = 0;
                }
        }
        if (mem_size)
-               add_memory_region(mem_start, mem_size, BOOT_MEM_RAM);
+               memblock_add(mem_start, mem_size);
 }
 
 void __init prom_meminit(u32 magic)