diff options
| author | Linus Torvalds | 2007-05-16 03:45:49 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-16 03:45:49 +0200 |
| commit | 28aa483f80d146a8f117eb65a4fddf31d58230d7 (patch) | |
| tree | fdd5b18fe9be33b38d1e9b1c1ebcff974f788a93 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (diff) | |
| download | kernel-qcow2-linux-28aa483f80d146a8f117eb65a4fddf31d58230d7.tar.gz kernel-qcow2-linux-28aa483f80d146a8f117eb65a4fddf31d58230d7.tar.xz kernel-qcow2-linux-28aa483f80d146a8f117eb65a4fddf31d58230d7.zip | |
x86: Fix discontigmem + non-HIGHMEM compile
It's not necessarily a very sane configuration, but people running "make
randconfig" noticed it wouldn't compile. This fixes some obvious
problems in discontig.c to allow a clean compile.
Acked-by: andrew hendry <andrew.hendry@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/i386/mm/discontig.c | 9 |
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 @@ #include <linux/module.h> #include <linux/kexec.h> #include <linux/pfn.h> +#include <linux/swap.h> #include <asm/e820.h> #include <asm/setup.h> @@ -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) { |