diff options
| author | Joerg Roedel | 2008-01-30 13:31:02 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:31:02 +0100 |
| commit | 40842bf50e0719bcfe817fec2fe8b0b98dcdb244 (patch) | |
| tree | 147d3b70cbbba0e64501aa40845e0b3994359832 /arch/x86/mm/init_64.c | |
| parent | x86: define all _PAGE_* in terms of _PAGE_BIT_* on 64-bit (diff) | |
| download | kernel-qcow2-linux-40842bf50e0719bcfe817fec2fe8b0b98dcdb244.tar.gz kernel-qcow2-linux-40842bf50e0719bcfe817fec2fe8b0b98dcdb244.tar.xz kernel-qcow2-linux-40842bf50e0719bcfe817fec2fe8b0b98dcdb244.zip | |
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/mm/init_64.c')
| -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) vaddr += addr & ~PMD_MASK; addr &= PMD_MASK; for (i = 0; i < pmds; i++, addr += PMD_SIZE) - set_pmd(pmd + i,__pmd(addr | _KERNPG_TABLE | _PAGE_PSE)); + set_pmd(pmd + i,__pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); __flush_tlb(); return (void *)vaddr; next: @@ -270,7 +270,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) if (pmd_val(*pmd)) continue; - entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address; + entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address; entry &= __supported_pte_mask; set_pmd(pmd, __pmd(entry)); } |