diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:04:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:37 -0400 |
commit | 715ee356535e861c0c0890697fa48eeb8af94019 (patch) | |
tree | 448b023754e011fa109b1be6d1d3382bbfa13c84 | |
parent | 3f29c33194d3b5fffdccc89665982a36b408b6f9 (diff) |
mm/um: 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: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/um/kernel/mem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index b0c763094ffb..7ddb64baf327 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -70,10 +70,8 @@ void __init mem_init(void) | |||
70 | #ifdef CONFIG_HIGHMEM | 70 | #ifdef CONFIG_HIGHMEM |
71 | setup_highmem(end_iomem, highmem); | 71 | setup_highmem(end_iomem, highmem); |
72 | #endif | 72 | #endif |
73 | num_physpages = totalram_pages; | ||
74 | max_pfn = totalram_pages; | 73 | max_pfn = totalram_pages; |
75 | printk(KERN_INFO "Memory: %luk available\n", | 74 | mem_init_print_info(NULL); |
76 | nr_free_pages() << (PAGE_SHIFT-10)); | ||
77 | kmalloc_ok = 1; | 75 | kmalloc_ok = 1; |
78 | } | 76 | } |
79 | 77 | ||