diff options
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/page.h | 7 | ||||
-rw-r--r-- | include/asm-x86_64/pgtable.h | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h index d7b101bb4a5f..dee632fa457d 100644 --- a/include/asm-x86_64/page.h +++ b/include/asm-x86_64/page.h | |||
@@ -79,9 +79,10 @@ extern unsigned long phys_base; | |||
79 | 79 | ||
80 | #define __PHYSICAL_START CONFIG_PHYSICAL_START | 80 | #define __PHYSICAL_START CONFIG_PHYSICAL_START |
81 | #define __KERNEL_ALIGN 0x200000 | 81 | #define __KERNEL_ALIGN 0x200000 |
82 | |||
82 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) | 83 | #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) |
83 | #define __START_KERNEL_map 0xffffffff80000000 | 84 | #define __START_KERNEL_map _AC(0xffffffff80000000, UL) |
84 | #define __PAGE_OFFSET 0xffff810000000000 | 85 | #define __PAGE_OFFSET _AC(0xffff810000000000, UL) |
85 | 86 | ||
86 | /* to align the pointer to the (next) page boundary */ | 87 | /* to align the pointer to the (next) page boundary */ |
87 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) | 88 | #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) |
@@ -93,7 +94,7 @@ extern unsigned long phys_base; | |||
93 | #define __VIRTUAL_MASK ((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1) | 94 | #define __VIRTUAL_MASK ((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1) |
94 | 95 | ||
95 | #define KERNEL_TEXT_SIZE (40*1024*1024) | 96 | #define KERNEL_TEXT_SIZE (40*1024*1024) |
96 | #define KERNEL_TEXT_START 0xffffffff80000000 | 97 | #define KERNEL_TEXT_START _AC(0xffffffff80000000, UL) |
97 | #define PAGE_OFFSET __PAGE_OFFSET | 98 | #define PAGE_OFFSET __PAGE_OFFSET |
98 | 99 | ||
99 | #ifndef __ASSEMBLY__ | 100 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h index 4e86aca57aea..08b9831f2e14 100644 --- a/include/asm-x86_64/pgtable.h +++ b/include/asm-x86_64/pgtable.h | |||
@@ -134,11 +134,11 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long | |||
134 | #define USER_PTRS_PER_PGD ((TASK_SIZE-1)/PGDIR_SIZE+1) | 134 | #define USER_PTRS_PER_PGD ((TASK_SIZE-1)/PGDIR_SIZE+1) |
135 | #define FIRST_USER_ADDRESS 0 | 135 | #define FIRST_USER_ADDRESS 0 |
136 | 136 | ||
137 | #define MAXMEM 0x3fffffffffff | 137 | #define MAXMEM _AC(0x3fffffffffff, UL) |
138 | #define VMALLOC_START 0xffffc20000000000 | 138 | #define VMALLOC_START _AC(0xffffc20000000000, UL) |
139 | #define VMALLOC_END 0xffffe1ffffffffff | 139 | #define VMALLOC_END _AC(0xffffe1ffffffffff, UL) |
140 | #define MODULES_VADDR 0xffffffff88000000 | 140 | #define MODULES_VADDR _AC(0xffffffff88000000, UL) |
141 | #define MODULES_END 0xfffffffffff00000 | 141 | #define MODULES_END _AC(0xfffffffffff00000, UL) |
142 | #define MODULES_LEN (MODULES_END - MODULES_VADDR) | 142 | #define MODULES_LEN (MODULES_END - MODULES_VADDR) |
143 | 143 | ||
144 | #define _PAGE_BIT_PRESENT 0 | 144 | #define _PAGE_BIT_PRESENT 0 |