diff options
Diffstat (limited to 'arch/score/mm/init.c')
-rw-r--r-- | arch/score/mm/init.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c index 0940682ab38b..9fbce49ad3bd 100644 --- a/arch/score/mm/init.c +++ b/arch/score/mm/init.c | |||
@@ -75,40 +75,19 @@ void __init paging_init(void) | |||
75 | 75 | ||
76 | void __init mem_init(void) | 76 | void __init mem_init(void) |
77 | { | 77 | { |
78 | unsigned long codesize, reservedpages, datasize, initsize; | ||
79 | unsigned long tmp, ram = 0; | ||
80 | |||
81 | high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); | 78 | high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); |
82 | totalram_pages += free_all_bootmem(); | 79 | free_all_bootmem(); |
83 | setup_zero_page(); /* Setup zeroed pages. */ | 80 | setup_zero_page(); /* Setup zeroed pages. */ |
84 | reservedpages = 0; | 81 | |
85 | 82 | mem_init_print_info(NULL); | |
86 | for (tmp = 0; tmp < max_low_pfn; tmp++) | ||
87 | if (page_is_ram(tmp)) { | ||
88 | ram++; | ||
89 | if (PageReserved(pfn_to_page(tmp))) | ||
90 | reservedpages++; | ||
91 | } | ||
92 | |||
93 | num_physpages = ram; | ||
94 | codesize = (unsigned long) &_etext - (unsigned long) &_text; | ||
95 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; | ||
96 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | ||
97 | |||
98 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " | ||
99 | "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", | ||
100 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | ||
101 | ram << (PAGE_SHIFT-10), codesize >> 10, | ||
102 | reservedpages << (PAGE_SHIFT-10), datasize >> 10, | ||
103 | initsize >> 10, | ||
104 | totalhigh_pages << (PAGE_SHIFT-10)); | ||
105 | } | 83 | } |
106 | #endif /* !CONFIG_NEED_MULTIPLE_NODES */ | 84 | #endif /* !CONFIG_NEED_MULTIPLE_NODES */ |
107 | 85 | ||
108 | #ifdef CONFIG_BLK_DEV_INITRD | 86 | #ifdef CONFIG_BLK_DEV_INITRD |
109 | void free_initrd_mem(unsigned long start, unsigned long end) | 87 | void free_initrd_mem(unsigned long start, unsigned long end) |
110 | { | 88 | { |
111 | free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd"); | 89 | free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM, |
90 | "initrd"); | ||
112 | } | 91 | } |
113 | #endif | 92 | #endif |
114 | 93 | ||