aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/mm')
-rw-r--r--arch/i386/mm/discontig.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index aa58720f6871..860e912a3fbb 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -31,6 +31,7 @@
31#include <linux/module.h> 31#include <linux/module.h>
32#include <linux/kexec.h> 32#include <linux/kexec.h>
33#include <linux/pfn.h> 33#include <linux/pfn.h>
34#include <linux/swap.h>
34 35
35#include <asm/e820.h> 36#include <asm/e820.h>
36#include <asm/setup.h> 37#include <asm/setup.h>
@@ -97,14 +98,8 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
97#endif 98#endif
98 99
99extern unsigned long find_max_low_pfn(void); 100extern unsigned long find_max_low_pfn(void);
100extern void find_max_pfn(void);
101extern void add_one_highpage_init(struct page *, int, int); 101extern void add_one_highpage_init(struct page *, int, int);
102
103extern struct e820map e820;
104extern unsigned long highend_pfn, highstart_pfn; 102extern unsigned long highend_pfn, highstart_pfn;
105extern unsigned long max_low_pfn;
106extern unsigned long totalram_pages;
107extern unsigned long totalhigh_pages;
108 103
109#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 104#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
110 105
@@ -360,7 +355,9 @@ void __init zone_sizes_init(void)
360 max_zone_pfns[ZONE_DMA] = 355 max_zone_pfns[ZONE_DMA] =
361 virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; 356 virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
362 max_zone_pfns[ZONE_NORMAL] = max_low_pfn; 357 max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
358#ifdef CONFIG_HIGHMEM
363 max_zone_pfns[ZONE_HIGHMEM] = highend_pfn; 359 max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;
360#endif
364 361
365 /* If SRAT has not registered memory, register it now */ 362 /* If SRAT has not registered memory, register it now */
366 if (find_max_pfn_with_active_regions() == 0) { 363 if (find_max_pfn_with_active_regions() == 0) {