diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-04-03 09:44:50 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-04-18 22:14:21 -0400 |
commit | fde3505c695e0de8ae7504b58d373db2d0ba498a (patch) | |
tree | 503ee7eee7b30be70713efc74944a109d4ce4b7f /arch/mips/mips-boards/sim | |
parent | 9c1f1257a364467d091c5166049addaf3e7d7118 (diff) |
[MIPS] Fixup damage done by 22a9835c350782a5c3257343713932af3ac92ee0.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/sim')
-rw-r--r-- | arch/mips/mips-boards/sim/sim_mem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mips-boards/sim/sim_mem.c index ede9c27e450b..f7ce76983328 100644 --- a/arch/mips/mips-boards/sim/sim_mem.c +++ b/arch/mips/mips-boards/sim/sim_mem.c | |||
@@ -18,6 +18,7 @@ | |||
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> |
@@ -59,10 +60,10 @@ struct prom_pmemblock * __init prom_getmdesc(void) | |||
59 | 60 | ||
60 | mdesc[2].type = simmem_reserved; | 61 | mdesc[2].type = simmem_reserved; |
61 | mdesc[2].base = 0x00100000; | 62 | mdesc[2].base = 0x00100000; |
62 | mdesc[2].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[2].base; | 63 | mdesc[2].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[2].base; |
63 | 64 | ||
64 | mdesc[3].type = simmem_free; | 65 | mdesc[3].type = simmem_free; |
65 | mdesc[3].base = CPHYSADDR(PAGE_ALIGN(&_end)); | 66 | mdesc[3].base = CPHYSADDR(PFN_ALIGN(&_end)); |
66 | mdesc[3].size = memsize - mdesc[3].base; | 67 | mdesc[3].size = memsize - mdesc[3].base; |
67 | 68 | ||
68 | return &mdesc[0]; | 69 | return &mdesc[0]; |