Merge remote branch 'linus/master' into x86/bootmem

[sfrench/cifs-2.6.git] / arch / score / mm / init.c

diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index 8c15b2c85d5a1d6afb6d7996f16b08948a21baee..7f001bbedb00a463d0746c2690421eec1df5bf3a 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
-static int __init page_is_ram(unsigned long pagenr)
+int page_is_ram(unsigned long pagenr)
 {
        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,
-                       (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
+                       totalhigh_pages << (PAGE_SHIFT-10));
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */