summaryrefslogtreecommitdiffstats
path: root/arch/score
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-07-04 00:04:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-04 01:07:37 +0200
commitad941989d0cf2ef1320ecf46ee1188df85e94b43 (patch)
tree7044dca7c689f4b61ebcbe0217beb950fb5e1874 /arch/score
parentmm/s390: prepare for removing num_physpages and simplify mem_init() (diff)
downloadlinux-ad941989d0cf2ef1320ecf46ee1188df85e94b43.tar.xz
linux-ad941989d0cf2ef1320ecf46ee1188df85e94b43.zip
mm/score: prepare for removing num_physpages and simplify mem_init()
Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: Chen Liqin <liqin.chen@sunplusct.com> Cc: Lennox Wu <lennox.wu@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/score')
-rw-r--r--arch/score/mm/init.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index a8b917742dec..9fbce49ad3bd 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -75,33 +75,11 @@ void __init paging_init(void)
void __init mem_init(void)
{
- unsigned long codesize, reservedpages, datasize, initsize;
- unsigned long tmp, ram = 0;
-
high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
free_all_bootmem();
setup_zero_page(); /* Setup zeroed pages. */
- reservedpages = 0;
-
- for (tmp = 0; tmp < max_low_pfn; tmp++)
- if (page_is_ram(tmp)) {
- ram++;
- if (PageReserved(pfn_to_page(tmp)))
- reservedpages++;
- }
-
- num_physpages = ram;
- codesize = (unsigned long) &_etext - (unsigned long) &_text;
- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
- initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
- printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
- "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
- (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
- ram << (PAGE_SHIFT-10), codesize >> 10,
- reservedpages << (PAGE_SHIFT-10), datasize >> 10,
- initsize >> 10,
- totalhigh_pages << (PAGE_SHIFT-10));
+
+ mem_init_print_info(NULL);
}
#endif /* !CONFIG_NEED_MULTIPLE_NODES */