diff options
-rw-r--r-- | mm/internal.h | 3 | ||||
-rw-r--r-- | mm/memory.c | 1 | ||||
-rw-r--r-- | mm/page_alloc.c | 1 |
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 | ||
40 | extern 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 | */ |
49 | extern unsigned long highest_memmap_pfn; | ||
50 | extern void __free_pages_bootmem(struct page *page, unsigned int order); | 51 | extern void __free_pages_bootmem(struct page *page, unsigned int order); |
51 | extern void prep_compound_page(struct page *page, unsigned long order); | 52 | extern 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 | ||
111 | unsigned long zero_pfn __read_mostly; | 111 | unsigned long zero_pfn __read_mostly; |
112 | unsigned 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 | ||
73 | unsigned long totalram_pages __read_mostly; | 73 | unsigned long totalram_pages __read_mostly; |
74 | unsigned long totalreserve_pages __read_mostly; | 74 | unsigned long totalreserve_pages __read_mostly; |
75 | unsigned long highest_memmap_pfn __read_mostly; | ||
76 | int percpu_pagelist_fraction; | 75 | int percpu_pagelist_fraction; |
77 | gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; | 76 | gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; |
78 | 77 | ||