diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /include/asm-x86/page_32.h | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'include/asm-x86/page_32.h')
| -rw-r--r-- | include/asm-x86/page_32.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index f32062a821c5..72f7305682c6 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
| @@ -89,9 +89,6 @@ extern int nx_enabled; | |||
| 89 | extern unsigned int __VMALLOC_RESERVE; | 89 | extern unsigned int __VMALLOC_RESERVE; |
| 90 | extern int sysctl_legacy_va_layout; | 90 | extern int sysctl_legacy_va_layout; |
| 91 | 91 | ||
| 92 | #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) | ||
| 93 | #define MAXMEM (-__PAGE_OFFSET - __VMALLOC_RESERVE) | ||
| 94 | |||
| 95 | extern void find_low_pfn_range(void); | 92 | extern void find_low_pfn_range(void); |
| 96 | extern unsigned long init_memory_mapping(unsigned long start, | 93 | extern unsigned long init_memory_mapping(unsigned long start, |
| 97 | unsigned long end); | 94 | unsigned long end); |