aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/internal.h3
-rw-r--r--mm/memory.c1
-rw-r--r--mm/page_alloc.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/mm/internal.h b/mm/internal.h
index 75596574911e..22ec8d2b0fb8 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -37,6 +37,8 @@ static inline void __put_page(struct page *page)
37 atomic_dec(&page->_count); 37 atomic_dec(&page->_count);
38} 38}
39 39
40extern unsigned long highest_memmap_pfn;
41
40/* 42/*
41 * in mm/vmscan.c: 43 * in mm/vmscan.c:
42 */ 44 */
@@ -46,7 +48,6 @@ extern void putback_lru_page(struct page *page);
46/* 48/*
47 * in mm/page_alloc.c 49 * in mm/page_alloc.c
48 */ 50 */
49extern unsigned long highest_memmap_pfn;
50extern void __free_pages_bootmem(struct page *page, unsigned int order); 51extern void __free_pages_bootmem(struct page *page, unsigned int order);
51extern void prep_compound_page(struct page *page, unsigned long order); 52extern void prep_compound_page(struct page *page, unsigned long order);
52 53
diff --git a/mm/memory.c b/mm/memory.c
index 9bdbd10cb418..b1443ac07c00 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -109,6 +109,7 @@ static int __init disable_randmaps(char *s)
109__setup("norandmaps", disable_randmaps); 109__setup("norandmaps", disable_randmaps);
110 110
111unsigned long zero_pfn __read_mostly; 111unsigned long zero_pfn __read_mostly;
112unsigned long highest_memmap_pfn __read_mostly;
112 113
113/* 114/*
114 * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init() 115 * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init()
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6877e22e3aa1..5717f27a0704 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -72,7 +72,6 @@ EXPORT_SYMBOL(node_states);
72 72
73unsigned long totalram_pages __read_mostly; 73unsigned long totalram_pages __read_mostly;
74unsigned long totalreserve_pages __read_mostly; 74unsigned long totalreserve_pages __read_mostly;
75unsigned long highest_memmap_pfn __read_mostly;
76int percpu_pagelist_fraction; 75int percpu_pagelist_fraction;
77gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; 76gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK;
78 77