diff options
Diffstat (limited to 'include/asm-x86/page_64.h')
-rw-r--r-- | include/asm-x86/page_64.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index 143546073b95..6ea72859c491 100644 --- a/include/asm-x86/page_64.h +++ b/include/asm-x86/page_64.h | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | #define THREAD_ORDER 1 | 6 | #define THREAD_ORDER 1 |
7 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) | 7 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) |
8 | #define CURRENT_MASK (~(THREAD_SIZE-1)) | 8 | #define CURRENT_MASK (~(THREAD_SIZE - 1)) |
9 | 9 | ||
10 | #define EXCEPTION_STACK_ORDER 0 | 10 | #define EXCEPTION_STACK_ORDER 0 |
11 | #define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER) | 11 | #define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER) |
@@ -48,10 +48,10 @@ | |||
48 | #define __VIRTUAL_MASK_SHIFT 48 | 48 | #define __VIRTUAL_MASK_SHIFT 48 |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * Kernel image size is limited to 128 MB (see level2_kernel_pgt in | 51 | * Kernel image size is limited to 512 MB (see level2_kernel_pgt in |
52 | * arch/x86/kernel/head_64.S), and it is mapped here: | 52 | * arch/x86/kernel/head_64.S), and it is mapped here: |
53 | */ | 53 | */ |
54 | #define KERNEL_IMAGE_SIZE (128*1024*1024) | 54 | #define KERNEL_IMAGE_SIZE (512 * 1024 * 1024) |
55 | #define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL) | 55 | #define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL) |
56 | 56 | ||
57 | #ifndef __ASSEMBLY__ | 57 | #ifndef __ASSEMBLY__ |
@@ -59,7 +59,6 @@ void clear_page(void *page); | |||
59 | void copy_page(void *to, void *from); | 59 | void copy_page(void *to, void *from); |
60 | 60 | ||
61 | extern unsigned long end_pfn; | 61 | extern unsigned long end_pfn; |
62 | extern unsigned long end_pfn_map; | ||
63 | extern unsigned long phys_base; | 62 | extern unsigned long phys_base; |
64 | 63 | ||
65 | extern unsigned long __phys_addr(unsigned long); | 64 | extern unsigned long __phys_addr(unsigned long); |
@@ -81,6 +80,9 @@ typedef struct { pteval_t pte; } pte_t; | |||
81 | 80 | ||
82 | #define vmemmap ((struct page *)VMEMMAP_START) | 81 | #define vmemmap ((struct page *)VMEMMAP_START) |
83 | 82 | ||
83 | extern unsigned long init_memory_mapping(unsigned long start, | ||
84 | unsigned long end); | ||
85 | |||
84 | #endif /* !__ASSEMBLY__ */ | 86 | #endif /* !__ASSEMBLY__ */ |
85 | 87 | ||
86 | #ifdef CONFIG_FLATMEM | 88 | #ifdef CONFIG_FLATMEM |