diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fa974d87f60d..7633c503a116 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -111,6 +111,7 @@ static DEFINE_SPINLOCK(managed_page_count_lock); | |||
111 | 111 | ||
112 | unsigned long totalram_pages __read_mostly; | 112 | unsigned long totalram_pages __read_mostly; |
113 | unsigned long totalreserve_pages __read_mostly; | 113 | unsigned long totalreserve_pages __read_mostly; |
114 | unsigned long totalcma_pages __read_mostly; | ||
114 | /* | 115 | /* |
115 | * When calculating the number of globally allowed dirty pages, there | 116 | * When calculating the number of globally allowed dirty pages, there |
116 | * is a certain number of per-zone reserves that should not be | 117 | * is a certain number of per-zone reserves that should not be |
@@ -5586,7 +5587,7 @@ void __init mem_init_print_info(const char *str) | |||
5586 | 5587 | ||
5587 | pr_info("Memory: %luK/%luK available " | 5588 | pr_info("Memory: %luK/%luK available " |
5588 | "(%luK kernel code, %luK rwdata, %luK rodata, " | 5589 | "(%luK kernel code, %luK rwdata, %luK rodata, " |
5589 | "%luK init, %luK bss, %luK reserved" | 5590 | "%luK init, %luK bss, %luK reserved, %luK cma-reserved" |
5590 | #ifdef CONFIG_HIGHMEM | 5591 | #ifdef CONFIG_HIGHMEM |
5591 | ", %luK highmem" | 5592 | ", %luK highmem" |
5592 | #endif | 5593 | #endif |
@@ -5594,7 +5595,8 @@ void __init mem_init_print_info(const char *str) | |||
5594 | nr_free_pages() << (PAGE_SHIFT-10), physpages << (PAGE_SHIFT-10), | 5595 | nr_free_pages() << (PAGE_SHIFT-10), physpages << (PAGE_SHIFT-10), |
5595 | codesize >> 10, datasize >> 10, rosize >> 10, | 5596 | codesize >> 10, datasize >> 10, rosize >> 10, |
5596 | (init_data_size + init_code_size) >> 10, bss_size >> 10, | 5597 | (init_data_size + init_code_size) >> 10, bss_size >> 10, |
5597 | (physpages - totalram_pages) << (PAGE_SHIFT-10), | 5598 | (physpages - totalram_pages - totalcma_pages) << (PAGE_SHIFT-10), |
5599 | totalcma_pages << (PAGE_SHIFT-10), | ||
5598 | #ifdef CONFIG_HIGHMEM | 5600 | #ifdef CONFIG_HIGHMEM |
5599 | totalhigh_pages << (PAGE_SHIFT-10), | 5601 | totalhigh_pages << (PAGE_SHIFT-10), |
5600 | #endif | 5602 | #endif |