diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2008-01-30 07:31:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:02 -0500 |
commit | 40842bf50e0719bcfe817fec2fe8b0b98dcdb244 (patch) | |
tree | 147d3b70cbbba0e64501aa40845e0b3994359832 /arch/x86 | |
parent | 1c6f70309900c47eeaef12c97b206fcccde1ebe2 (diff) |
x86: use __PAGE_KERNEL* instead of _KERNPG_TABLE
This minor cleanup replaces _KERNPG_TABLE with the __PAGE_KERNEL* for 2MB PTEs
in the 64-bit memory initialization code. The __PAGE_KERNEL* defines are more
appropriate for PTEs.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/mm/init_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 251eeb325ae3..3f8bf298dbb8 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -226,7 +226,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size) | |||
226 | vaddr += addr & ~PMD_MASK; | 226 | vaddr += addr & ~PMD_MASK; |
227 | addr &= PMD_MASK; | 227 | addr &= PMD_MASK; |
228 | for (i = 0; i < pmds; i++, addr += PMD_SIZE) | 228 | for (i = 0; i < pmds; i++, addr += PMD_SIZE) |
229 | set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | _PAGE_PSE)); | 229 | set_pmd(pmd + i,__pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); |
230 | __flush_tlb(); | 230 | __flush_tlb(); |
231 | return (void *)vaddr; | 231 | return (void *)vaddr; |
232 | next: | 232 | next: |
@@ -270,7 +270,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | |||
270 | if (pmd_val(*pmd)) | 270 | if (pmd_val(*pmd)) |
271 | continue; | 271 | continue; |
272 | 272 | ||
273 | entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address; | 273 | entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address; |
274 | entry &= __supported_pte_mask; | 274 | entry &= __supported_pte_mask; |
275 | set_pmd(pmd, __pmd(entry)); | 275 | set_pmd(pmd, __pmd(entry)); |
276 | } | 276 | } |