diff options
| author | Zhong Hongbo <bocui107@gmail.com> | 2014-12-12 19:56:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 15:42:49 -0500 |
| commit | ba914f481507a0542a7c8a3fc15d89414bc2ebf3 (patch) | |
| tree | 7e6e11e2b9e1674af128aed4d28e02f6c920efdf /mm/page_alloc.c | |
| parent | 2ebba6b7e1d98724d266ae048d8af4f7ca95cafd (diff) | |
mm: remove the highmem zones' memmap in the highmem zone
Since 01cefaef40c4 ("mm: provide more accurate estimation
of pages occupied by memmap") allocate the pages from lowmem for the
highmem zones' memmap. So It is not need to reserver the memmap's for
the highmem.
A 2G DDR3 for the arm platform:
On node 0 totalpages: 524288
free_area_init_node: node 0, pgdat 80ccd380, node_mem_map 80d38000
DMA zone: 3568 pages used for memmap
DMA zone: 0 pages reserved
DMA zone: 456704 pages, LIFO batch:31
HighMem zone: 528 pages used for memmap
HighMem zone: 67584 pages, LIFO batch:15
On node 0 totalpages: 524288
free_area_init_node: node 0, pgdat 80cd6f40, node_mem_map 80d42000
DMA zone: 3568 pages used for memmap
DMA zone: 0 pages reserved
DMA zone: 456704 pages, LIFO batch:31
HighMem zone: 67584 pages, LIFO batch:15
Signed-off-by: Hongbo Zhong <hongbo.zhong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9d3870862293..fa974d87f60d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -4937,16 +4937,18 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, | |||
| 4937 | * and per-cpu initialisations | 4937 | * and per-cpu initialisations |
| 4938 | */ | 4938 | */ |
| 4939 | memmap_pages = calc_memmap_size(size, realsize); | 4939 | memmap_pages = calc_memmap_size(size, realsize); |
| 4940 | if (freesize >= memmap_pages) { | 4940 | if (!is_highmem_idx(j)) { |
| 4941 | freesize -= memmap_pages; | 4941 | if (freesize >= memmap_pages) { |
| 4942 | if (memmap_pages) | 4942 | freesize -= memmap_pages; |
| 4943 | printk(KERN_DEBUG | 4943 | if (memmap_pages) |
| 4944 | " %s zone: %lu pages used for memmap\n", | 4944 | printk(KERN_DEBUG |
| 4945 | zone_names[j], memmap_pages); | 4945 | " %s zone: %lu pages used for memmap\n", |
| 4946 | } else | 4946 | zone_names[j], memmap_pages); |
| 4947 | printk(KERN_WARNING | 4947 | } else |
| 4948 | " %s zone: %lu pages exceeds freesize %lu\n", | 4948 | printk(KERN_WARNING |
| 4949 | zone_names[j], memmap_pages, freesize); | 4949 | " %s zone: %lu pages exceeds freesize %lu\n", |
| 4950 | zone_names[j], memmap_pages, freesize); | ||
| 4951 | } | ||
| 4950 | 4952 | ||
| 4951 | /* Account for reserved pages */ | 4953 | /* Account for reserved pages */ |
| 4952 | if (j == 0 && freesize > dma_reserve) { | 4954 | if (j == 0 && freesize > dma_reserve) { |