aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3acb216e9a78..755c99a0ac71 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -69,6 +69,7 @@ EXPORT_SYMBOL(node_states);
69 69
70unsigned long totalram_pages __read_mostly; 70unsigned long totalram_pages __read_mostly;
71unsigned long totalreserve_pages __read_mostly; 71unsigned long totalreserve_pages __read_mostly;
72unsigned long highest_memmap_pfn __read_mostly;
72int percpu_pagelist_fraction; 73int percpu_pagelist_fraction;
73 74
74#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE 75#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -2597,6 +2598,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
2597 unsigned long pfn; 2598 unsigned long pfn;
2598 struct zone *z; 2599 struct zone *z;
2599 2600
2601 if (highest_memmap_pfn < end_pfn - 1)
2602 highest_memmap_pfn = end_pfn - 1;
2603
2600 z = &NODE_DATA(nid)->node_zones[zone]; 2604 z = &NODE_DATA(nid)->node_zones[zone];
2601 for (pfn = start_pfn; pfn < end_pfn; pfn++) { 2605 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
2602 /* 2606 /*