diff options
Diffstat (limited to 'arch/mips/mips-boards/sim/sim_mem.c')
| -rw-r--r-- | arch/mips/mips-boards/sim/sim_mem.c | 9 | 
1 files changed, 4 insertions, 5 deletions
| diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mips-boards/sim/sim_mem.c index e57f737bab10..f7ce76983328 100644 --- a/arch/mips/mips-boards/sim/sim_mem.c +++ b/arch/mips/mips-boards/sim/sim_mem.c | |||
| @@ -18,9 +18,11 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> | 
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> | 
| 20 | #include <linux/bootmem.h> | 20 | #include <linux/bootmem.h> | 
| 21 | #include <linux/pfn.h> | ||
| 21 | 22 | ||
| 22 | #include <asm/bootinfo.h> | 23 | #include <asm/bootinfo.h> | 
| 23 | #include <asm/page.h> | 24 | #include <asm/page.h> | 
| 25 | #include <asm/sections.h> | ||
| 24 | 26 | ||
| 25 | #include <asm/mips-boards/prom.h> | 27 | #include <asm/mips-boards/prom.h> | 
| 26 | 28 | ||
| @@ -39,9 +41,6 @@ static char *mtypes[3] = { | |||
| 39 | }; | 41 | }; | 
| 40 | #endif | 42 | #endif | 
| 41 | 43 | ||
| 42 | /* References to section boundaries */ | ||
| 43 | extern char _end; | ||
| 44 | |||
| 45 | struct prom_pmemblock * __init prom_getmdesc(void) | 44 | struct prom_pmemblock * __init prom_getmdesc(void) | 
| 46 | { | 45 | { | 
| 47 | unsigned int memsize; | 46 | unsigned int memsize; | 
| @@ -61,10 +60,10 @@ struct prom_pmemblock * __init prom_getmdesc(void) | |||
| 61 | 60 | ||
| 62 | mdesc[2].type = simmem_reserved; | 61 | mdesc[2].type = simmem_reserved; | 
| 63 | mdesc[2].base = 0x00100000; | 62 | mdesc[2].base = 0x00100000; | 
| 64 | mdesc[2].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[2].base; | 63 | mdesc[2].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[2].base; | 
| 65 | 64 | ||
| 66 | mdesc[3].type = simmem_free; | 65 | mdesc[3].type = simmem_free; | 
| 67 | mdesc[3].base = CPHYSADDR(PAGE_ALIGN(&_end)); | 66 | mdesc[3].base = CPHYSADDR(PFN_ALIGN(&_end)); | 
| 68 | mdesc[3].size = memsize - mdesc[3].base; | 67 | mdesc[3].size = memsize - mdesc[3].base; | 
| 69 | 68 | ||
| 70 | return &mdesc[0]; | 69 | return &mdesc[0]; | 
