diff options
-rw-r--r-- | include/asm-i386/pgtable.h | 2 | ||||
-rw-r--r-- | include/linux/mm.h | 1 | ||||
-rw-r--r-- | mm/memory.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index 0efa8063a3e9..01734e05e63b 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h | |||
@@ -79,7 +79,7 @@ void paging_init(void); | |||
79 | * area for the same reason. ;) | 79 | * area for the same reason. ;) |
80 | */ | 80 | */ |
81 | #define VMALLOC_OFFSET (8*1024*1024) | 81 | #define VMALLOC_OFFSET (8*1024*1024) |
82 | #define VMALLOC_START (((unsigned long) high_memory + vmalloc_earlyreserve + \ | 82 | #define VMALLOC_START (((unsigned long) high_memory + \ |
83 | 2*VMALLOC_OFFSET-1) & ~(VMALLOC_OFFSET-1)) | 83 | 2*VMALLOC_OFFSET-1) & ~(VMALLOC_OFFSET-1)) |
84 | #ifdef CONFIG_HIGHMEM | 84 | #ifdef CONFIG_HIGHMEM |
85 | # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) | 85 | # define VMALLOC_END (PKMAP_BASE-2*PAGE_SIZE) |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1c1207472bb4..bbd427e8741a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -27,7 +27,6 @@ extern unsigned long max_mapnr; | |||
27 | 27 | ||
28 | extern unsigned long num_physpages; | 28 | extern unsigned long num_physpages; |
29 | extern void * high_memory; | 29 | extern void * high_memory; |
30 | extern unsigned long vmalloc_earlyreserve; | ||
31 | extern int page_cluster; | 30 | extern int page_cluster; |
32 | 31 | ||
33 | #ifdef CONFIG_SYSCTL | 32 | #ifdef CONFIG_SYSCTL |
diff --git a/mm/memory.c b/mm/memory.c index cfddcd2075b9..b3d73bb1f680 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -78,11 +78,9 @@ unsigned long num_physpages; | |||
78 | * and ZONE_HIGHMEM. | 78 | * and ZONE_HIGHMEM. |
79 | */ | 79 | */ |
80 | void * high_memory; | 80 | void * high_memory; |
81 | unsigned long vmalloc_earlyreserve; | ||
82 | 81 | ||
83 | EXPORT_SYMBOL(num_physpages); | 82 | EXPORT_SYMBOL(num_physpages); |
84 | EXPORT_SYMBOL(high_memory); | 83 | EXPORT_SYMBOL(high_memory); |
85 | EXPORT_SYMBOL(vmalloc_earlyreserve); | ||
86 | 84 | ||
87 | int randomize_va_space __read_mostly = 1; | 85 | int randomize_va_space __read_mostly = 1; |
88 | 86 | ||