diff options
Diffstat (limited to 'arch/blackfin/mm/init.c')
-rw-r--r-- | arch/blackfin/mm/init.c | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index c73d80ef564f..166842de3dc7 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
@@ -90,43 +90,17 @@ asmlinkage void __init init_pda(void) | |||
90 | 90 | ||
91 | void __init mem_init(void) | 91 | void __init mem_init(void) |
92 | { | 92 | { |
93 | unsigned int codek = 0, datak = 0, initk = 0; | 93 | char buf[64]; |
94 | unsigned int reservedpages = 0, freepages = 0; | ||
95 | unsigned long tmp; | ||
96 | unsigned long start_mem = memory_start; | ||
97 | unsigned long end_mem = memory_end; | ||
98 | 94 | ||
99 | end_mem &= PAGE_MASK; | 95 | high_memory = (void *)(memory_end & PAGE_MASK); |
100 | high_memory = (void *)end_mem; | 96 | max_mapnr = MAP_NR(high_memory); |
101 | 97 | printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", max_mapnr); | |
102 | start_mem = PAGE_ALIGN(start_mem); | ||
103 | max_mapnr = num_physpages = MAP_NR(high_memory); | ||
104 | printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages); | ||
105 | 98 | ||
106 | /* This will put all low memory onto the freelists. */ | 99 | /* This will put all low memory onto the freelists. */ |
107 | free_all_bootmem(); | 100 | free_all_bootmem(); |
108 | 101 | ||
109 | reservedpages = 0; | 102 | snprintf(buf, sizeof(buf) - 1, "%uK DMA", DMA_UNCACHED_REGION >> 10); |
110 | for (tmp = ARCH_PFN_OFFSET; tmp < max_mapnr; tmp++) | 103 | mem_init_print_info(buf); |
111 | if (PageReserved(pfn_to_page(tmp))) | ||
112 | reservedpages++; | ||
113 | freepages = max_mapnr - ARCH_PFN_OFFSET - reservedpages; | ||
114 | |||
115 | /* do not count in kernel image between _rambase and _ramstart */ | ||
116 | reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT; | ||
117 | #if (defined(CONFIG_BFIN_EXTMEM_ICACHEABLE) && ANOMALY_05000263) | ||
118 | reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >> PAGE_SHIFT; | ||
119 | #endif | ||
120 | |||
121 | codek = (_etext - _stext) >> 10; | ||
122 | initk = (__init_end - __init_begin) >> 10; | ||
123 | datak = ((_ramstart - _rambase) >> 10) - codek - initk; | ||
124 | |||
125 | printk(KERN_INFO | ||
126 | "Memory available: %luk/%luk RAM, " | ||
127 | "(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n", | ||
128 | (unsigned long) freepages << (PAGE_SHIFT-10), (_ramend - CONFIG_PHY_RAM_BASE_ADDRESS) >> 10, | ||
129 | initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10))); | ||
130 | } | 104 | } |
131 | 105 | ||
132 | #ifdef CONFIG_BLK_DEV_INITRD | 106 | #ifdef CONFIG_BLK_DEV_INITRD |