Commit 40842bf5 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1c6f7030
...@@ -226,7 +226,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size) ...@@ -226,7 +226,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size)
vaddr += addr & ~PMD_MASK; vaddr += addr & ~PMD_MASK;
addr &= PMD_MASK; addr &= PMD_MASK;
for (i = 0; i < pmds; i++, addr += PMD_SIZE) 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(); __flush_tlb();
return (void *)vaddr; return (void *)vaddr;
next: next:
...@@ -270,7 +270,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) ...@@ -270,7 +270,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end)
if (pmd_val(*pmd)) if (pmd_val(*pmd))
continue; continue;
entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address; entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address;
entry &= __supported_pte_mask; entry &= __supported_pte_mask;
set_pmd(pmd, __pmd(entry)); set_pmd(pmd, __pmd(entry));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment