From bd9ee39c7b05b7fef513454c354c710f8914fc1a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 15 May 2007 18:45:49 -0700 Subject: [PATCH] --- yaml --- r: 56423 b: refs/heads/master c: 28aa483f80d146a8f117eb65a4fddf31d58230d7 h: refs/heads/master i: 56421: 0d1ca68ff2db9a5e2de11b5ff92cf3df097f0b1d 56419: 4a53eb20a1d070bd7efe8e3ca4245a50c1475842 56415: 294b6ebb36a3628697c63e465696ddb15672a497 v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/discontig.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fcb8acdef2d0..6fba8ccdeaa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0560551dca0c02a4b23f95a9c339882ff291e1c7 +refs/heads/master: 28aa483f80d146a8f117eb65a4fddf31d58230d7 diff --git a/trunk/arch/i386/mm/discontig.c b/trunk/arch/i386/mm/discontig.c index aa58720f6871..860e912a3fbb 100644 --- a/trunk/arch/i386/mm/discontig.c +++ b/trunk/arch/i386/mm/discontig.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -97,14 +98,8 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn, #endif extern unsigned long find_max_low_pfn(void); -extern void find_max_pfn(void); extern void add_one_highpage_init(struct page *, int, int); - -extern struct e820map e820; extern unsigned long highend_pfn, highstart_pfn; -extern unsigned long max_low_pfn; -extern unsigned long totalram_pages; -extern unsigned long totalhigh_pages; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) @@ -360,7 +355,9 @@ void __init zone_sizes_init(void) max_zone_pfns[ZONE_DMA] = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; max_zone_pfns[ZONE_NORMAL] = max_low_pfn; +#ifdef CONFIG_HIGHMEM max_zone_pfns[ZONE_HIGHMEM] = highend_pfn; +#endif /* If SRAT has not registered memory, register it now */ if (find_max_pfn_with_active_regions() == 0) {