diff options
Diffstat (limited to 'arch/um/kernel/mem.c')
-rw-r--r-- | arch/um/kernel/mem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 9df292b270a8..7ddb64baf327 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
@@ -65,15 +65,13 @@ void __init mem_init(void) | |||
65 | uml_reserved = brk_end; | 65 | uml_reserved = brk_end; |
66 | 66 | ||
67 | /* this will put all low memory onto the freelists */ | 67 | /* this will put all low memory onto the freelists */ |
68 | totalram_pages = free_all_bootmem(); | 68 | free_all_bootmem(); |
69 | max_low_pfn = totalram_pages; | 69 | max_low_pfn = totalram_pages; |
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 | ||
@@ -244,7 +242,7 @@ void free_initmem(void) | |||
244 | #ifdef CONFIG_BLK_DEV_INITRD | 242 | #ifdef CONFIG_BLK_DEV_INITRD |
245 | void free_initrd_mem(unsigned long start, unsigned long end) | 243 | void free_initrd_mem(unsigned long start, unsigned long end) |
246 | { | 244 | { |
247 | free_reserved_area(start, end, 0, "initrd"); | 245 | free_reserved_area((void *)start, (void *)end, -1, "initrd"); |
248 | } | 246 | } |
249 | #endif | 247 | #endif |
250 | 248 | ||