git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpica into release branch
[pandora-kernel.git]
/
arch
/
mips
/
mips-boards
/
sim
/
sim_mem.c
diff --git
a/arch/mips/mips-boards/sim/sim_mem.c
b/arch/mips/mips-boards/sim/sim_mem.c
index
e57f737
..
f7ce769
100644
(file)
--- a/
arch/mips/mips-boards/sim/sim_mem.c
+++ b/
arch/mips/mips-boards/sim/sim_mem.c
@@
-18,9
+18,11
@@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
+#include <linux/pfn.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
+#include <asm/sections.h>
#include <asm/mips-boards/prom.h>
#include <asm/mips-boards/prom.h>
@@
-39,9
+41,6
@@
static char *mtypes[3] = {
};
#endif
};
#endif
-/* References to section boundaries */
-extern char _end;
-
struct prom_pmemblock * __init prom_getmdesc(void)
{
unsigned int memsize;
struct prom_pmemblock * __init prom_getmdesc(void)
{
unsigned int memsize;
@@
-61,10
+60,10
@@
struct prom_pmemblock * __init prom_getmdesc(void)
mdesc[2].type = simmem_reserved;
mdesc[2].base = 0x00100000;
mdesc[2].type = simmem_reserved;
mdesc[2].base = 0x00100000;
- mdesc[2].size = CPHYSADDR(P
AGE
_ALIGN(&_end)) - mdesc[2].base;
+ mdesc[2].size = CPHYSADDR(P
FN
_ALIGN(&_end)) - mdesc[2].base;
mdesc[3].type = simmem_free;
mdesc[3].type = simmem_free;
- mdesc[3].base = CPHYSADDR(P
AGE
_ALIGN(&_end));
+ mdesc[3].base = CPHYSADDR(P
FN
_ALIGN(&_end));
mdesc[3].size = memsize - mdesc[3].base;
return &mdesc[0];
mdesc[3].size = memsize - mdesc[3].base;
return &mdesc[0];