|
@@ -288,10 +288,6 @@ static void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
|
|
|
|
|
|
void __init mem_init(void)
|
|
|
{
|
|
|
- int codepages = 0;
|
|
|
- int datapages = 0;
|
|
|
- int initpages = 0;
|
|
|
- int reservedpages = 0;
|
|
|
int i;
|
|
|
|
|
|
if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
|
|
@@ -329,8 +325,6 @@ void __init mem_init(void)
|
|
|
unsigned long start_pfn = sp_banks[i].base_addr >> PAGE_SHIFT;
|
|
|
unsigned long end_pfn = (sp_banks[i].base_addr + sp_banks[i].num_bytes) >> PAGE_SHIFT;
|
|
|
|
|
|
- num_physpages += sp_banks[i].num_bytes >> PAGE_SHIFT;
|
|
|
-
|
|
|
if (end_pfn <= highstart_pfn)
|
|
|
continue;
|
|
|
|
|
@@ -340,39 +334,19 @@ void __init mem_init(void)
|
|
|
map_high_region(start_pfn, end_pfn);
|
|
|
}
|
|
|
|
|
|
- codepages = (((unsigned long) &_etext) - ((unsigned long)&_start));
|
|
|
- codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
|
|
|
- datapages = (((unsigned long) &_edata) - ((unsigned long)&_etext));
|
|
|
- datapages = PAGE_ALIGN(datapages) >> PAGE_SHIFT;
|
|
|
- initpages = (((unsigned long) &__init_end) - ((unsigned long) &__init_begin));
|
|
|
- initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
|
|
|
-
|
|
|
- /* Ignore memory holes for the purpose of counting reserved pages */
|
|
|
- for (i=0; i < max_low_pfn; i++)
|
|
|
- if (test_bit(i >> (20 - PAGE_SHIFT), sparc_valid_addr_bitmap)
|
|
|
- && PageReserved(pfn_to_page(i)))
|
|
|
- reservedpages++;
|
|
|
-
|
|
|
- printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
|
|
|
- nr_free_pages() << (PAGE_SHIFT-10),
|
|
|
- num_physpages << (PAGE_SHIFT - 10),
|
|
|
- codepages << (PAGE_SHIFT-10),
|
|
|
- reservedpages << (PAGE_SHIFT - 10),
|
|
|
- datapages << (PAGE_SHIFT-10),
|
|
|
- initpages << (PAGE_SHIFT-10),
|
|
|
- totalhigh_pages << (PAGE_SHIFT-10));
|
|
|
+ mem_init_print_info(NULL);
|
|
|
}
|
|
|
|
|
|
void free_initmem (void)
|
|
|
{
|
|
|
- num_physpages += free_initmem_default(POISON_FREE_INITMEM);
|
|
|
+ free_initmem_default(POISON_FREE_INITMEM);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
void free_initrd_mem(unsigned long start, unsigned long end)
|
|
|
{
|
|
|
- num_physpages += free_reserved_area((void *)start, (void *)end,
|
|
|
- POISON_FREE_INITMEM, "initrd");
|
|
|
+ free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
|
|
|
+ "initrd");
|
|
|
}
|
|
|
#endif
|
|
|
|