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
Merge branch 'linus' into x86/mm
[pandora-kernel.git]
/
arch
/
score
/
mm
/
init.c
diff --git
a/arch/score/mm/init.c
b/arch/score/mm/init.c
index
8c15b2c
..
7f001bb
100644
(file)
--- a/
arch/score/mm/init.c
+++ b/
arch/score/mm/init.c
@@
-59,7
+59,7
@@
static unsigned long setup_zero_page(void)
}
#ifndef CONFIG_NEED_MULTIPLE_NODES
}
#ifndef CONFIG_NEED_MULTIPLE_NODES
-
static int __ini
t page_is_ram(unsigned long pagenr)
+
in
t page_is_ram(unsigned long pagenr)
{
if (pagenr >= min_low_pfn && pagenr < max_low_pfn)
return 1;
{
if (pagenr >= min_low_pfn && pagenr < max_low_pfn)
return 1;
@@
-106,7
+106,7
@@
void __init mem_init(void)
ram << (PAGE_SHIFT-10), codesize >> 10,
reservedpages << (PAGE_SHIFT-10), datasize >> 10,
initsize >> 10,
ram << (PAGE_SHIFT-10), codesize >> 10,
reservedpages << (PAGE_SHIFT-10), datasize >> 10,
initsize >> 10,
-
(unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)
));
+
totalhigh_pages << (PAGE_SHIFT-10
));
}
#endif /* !CONFIG_NEED_MULTIPLE_NODES */
}
#endif /* !CONFIG_NEED_MULTIPLE_NODES */