Commit d9d7e769815c9cb66c8a4b144f066bb957ebd98e
Committed by
Linus Torvalds
Linus Torvalds
1 parent
6703bdf669
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
mm/blackfin: prepare for removing num_physpages and simplify mem_init()
Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Bob Liu <lliubbo@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 6 additions and 32 deletions Side-by-side Diff
arch/blackfin/mm/init.c
| ... | ... | @@ -90,43 +90,17 @@ |
| 90 | 90 | |
| 91 | 91 | void __init mem_init(void) |
| 92 | 92 | { |
| 93 | - unsigned int codek = 0, datak = 0, initk = 0; | |
| 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; | |
| 93 | + char buf[64]; | |
| 98 | 94 | |
| 99 | - end_mem &= PAGE_MASK; | |
| 100 | - high_memory = (void *)end_mem; | |
| 95 | + high_memory = (void *)(memory_end & PAGE_MASK); | |
| 96 | + max_mapnr = MAP_NR(high_memory); | |
| 97 | + printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", max_mapnr); | |
| 101 | 98 | |
| 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 | - | |
| 106 | 99 | /* This will put all low memory onto the freelists. */ |
| 107 | 100 | free_all_bootmem(); |
| 108 | 101 | |
| 109 | - reservedpages = 0; | |
| 110 | - for (tmp = ARCH_PFN_OFFSET; tmp < max_mapnr; tmp++) | |
| 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))); | |
| 102 | + snprintf(buf, sizeof(buf) - 1, "%uK DMA", DMA_UNCACHED_REGION >> 10); | |
| 103 | + mem_init_print_info(buf); | |
| 130 | 104 | } |
| 131 | 105 | |
| 132 | 106 | #ifdef CONFIG_BLK_DEV_INITRD |