aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/init_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/mm/init_64.c')
-rw-r--r--arch/sparc/mm/init_64.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 752d73837f9e..a9c42a7ffb6a 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2045,7 +2045,6 @@ static void __init register_page_bootmem_info(void)
2045} 2045}
2046void __init mem_init(void) 2046void __init mem_init(void)
2047{ 2047{
2048 unsigned long codepages, datapages, initpages;
2049 unsigned long addr, last; 2048 unsigned long addr, last;
2050 2049
2051 addr = PAGE_OFFSET + kern_base; 2050 addr = PAGE_OFFSET + kern_base;
@@ -2063,11 +2062,6 @@ void __init mem_init(void)
2063 register_page_bootmem_info(); 2062 register_page_bootmem_info();
2064 free_all_bootmem(); 2063 free_all_bootmem();
2065 2064
2066 /* We subtract one to account for the mem_map_zero page
2067 * allocated below.
2068 */
2069 num_physpages = totalram_pages - 1;
2070
2071 /* 2065 /*
2072 * Set up the zero page, mark it reserved, so that page count 2066 * Set up the zero page, mark it reserved, so that page count
2073 * is not manipulated when freeing the page from user ptes. 2067 * is not manipulated when freeing the page from user ptes.
@@ -2079,19 +2073,7 @@ void __init mem_init(void)
2079 } 2073 }
2080 mark_page_reserved(mem_map_zero); 2074 mark_page_reserved(mem_map_zero);
2081 2075
2082 codepages = (((unsigned long) _etext) - ((unsigned long) _start)); 2076 mem_init_print_info(NULL);
2083 codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
2084 datapages = (((unsigned long) _edata) - ((unsigned long) _etext));
2085 datapages = PAGE_ALIGN(datapages) >> PAGE_SHIFT;
2086 initpages = (((unsigned long) __init_end) - ((unsigned long) __init_begin));
2087 initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
2088
2089 printk("Memory: %luk available (%ldk kernel code, %ldk data, %ldk init) [%016lx,%016lx]\n",
2090 nr_free_pages() << (PAGE_SHIFT-10),
2091 codepages << (PAGE_SHIFT-10),
2092 datapages << (PAGE_SHIFT-10),
2093 initpages << (PAGE_SHIFT-10),
2094 PAGE_OFFSET, (last_valid_pfn << PAGE_SHIFT));
2095 2077
2096 if (tlb_type == cheetah || tlb_type == cheetah_plus) 2078 if (tlb_type == cheetah || tlb_type == cheetah_plus)
2097 cheetah_ecache_flush_init(); 2079 cheetah_ecache_flush_init();
@@ -2131,8 +2113,8 @@ void free_initmem(void)
2131#ifdef CONFIG_BLK_DEV_INITRD 2113#ifdef CONFIG_BLK_DEV_INITRD
2132void free_initrd_mem(unsigned long start, unsigned long end) 2114void free_initrd_mem(unsigned long start, unsigned long end)
2133{ 2115{
2134 num_physpages += free_reserved_area((void *)start, (void *)end, 2116 free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
2135 POISON_FREE_INITMEM, "initrd"); 2117 "initrd");
2136} 2118}
2137#endif 2119#endif
2138 2120