提交 da61efcf 编写于 作者: J Jiang Liu 提交者: Linus Torvalds

mm/SH: prepare for removing num_physpages and simplify mem_init()

Prepare for removing num_physpages and simplify mem_init().
Signed-off-by: NJiang Liu <jiang.liu@huawei.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 ad941989
...@@ -407,24 +407,18 @@ unsigned int mem_init_done = 0; ...@@ -407,24 +407,18 @@ unsigned int mem_init_done = 0;
void __init mem_init(void) void __init mem_init(void)
{ {
int codesize, datasize, initsize; pg_data_t *pgdat;
int nid;
iommu_init(); iommu_init();
num_physpages = 0;
high_memory = NULL; high_memory = NULL;
for_each_online_node(nid) { for_each_online_pgdat(pgdat) {
pg_data_t *pgdat = NODE_DATA(nid);
void *node_high_memory; void *node_high_memory;
num_physpages += pgdat->node_present_pages;
if (pgdat->node_spanned_pages) if (pgdat->node_spanned_pages)
free_all_bootmem_node(pgdat); free_all_bootmem_node(pgdat);
node_high_memory = (void *)__va((pgdat->node_start_pfn + node_high_memory = (void *)__va((pgdat->node_start_pfn +
pgdat->node_spanned_pages) << pgdat->node_spanned_pages) <<
PAGE_SHIFT); PAGE_SHIFT);
...@@ -441,19 +435,8 @@ void __init mem_init(void) ...@@ -441,19 +435,8 @@ void __init mem_init(void)
vsyscall_init(); vsyscall_init();
codesize = (unsigned long) &_etext - (unsigned long) &_text; mem_init_print_info(NULL);
datasize = (unsigned long) &_edata - (unsigned long) &_etext; pr_info("virtual kernel memory layout:\n"
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
"%dk data, %dk init)\n",
nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10),
codesize >> 10,
datasize >> 10,
initsize >> 10);
printk(KERN_INFO "virtual kernel memory layout:\n"
" fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
" pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n" " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册