aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/init_64.c2
-rw-r--r--include/asm-x86/pgtable_64.h22
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 3f8bf298dbb8..5cadbb40da3e 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 | __PAGE_KERNEL_LARGE_EXEC)); 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:
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index 6cf40dec0932..3072619365a8 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/include/asm-x86/pgtable_64.h
@@ -154,22 +154,22 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
154#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */ 154#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
155#define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ 155#define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
156 156
157#define _PAGE_PRESENT (_AC(1,UL)<<_PAGE_BIT_PRESENT) 157#define _PAGE_PRESENT (_AC(1, UL)<<_PAGE_BIT_PRESENT)
158#define _PAGE_RW (_AC(1,UL)<<_PAGE_BIT_RW) 158#define _PAGE_RW (_AC(1, UL)<<_PAGE_BIT_RW)
159#define _PAGE_USER (_AC(1,UL)<<_PAGE_BIT_USER) 159#define _PAGE_USER (_AC(1, UL)<<_PAGE_BIT_USER)
160#define _PAGE_PWT (_AC(1,UL)<<_PAGE_BIT_PWT) 160#define _PAGE_PWT (_AC(1, UL)<<_PAGE_BIT_PWT)
161#define _PAGE_PCD (_AC(1,UL)<<_PAGE_BIT_PCD) 161#define _PAGE_PCD (_AC(1, UL)<<_PAGE_BIT_PCD)
162#define _PAGE_ACCESSED (_AC(1,UL)<<_PAGE_BIT_ACCESSED) 162#define _PAGE_ACCESSED (_AC(1, UL)<<_PAGE_BIT_ACCESSED)
163#define _PAGE_DIRTY (_AC(1,UL)<<_PAGE_BIT_DIRTY) 163#define _PAGE_DIRTY (_AC(1, UL)<<_PAGE_BIT_DIRTY)
164/* 2MB page */ 164/* 2MB page */
165#define _PAGE_PSE (_AC(1,UL)<<_PAGE_BIT_PSE) 165#define _PAGE_PSE (_AC(1, UL)<<_PAGE_BIT_PSE)
166/* nonlinear file mapping, saved PTE; unset:swap */ 166/* nonlinear file mapping, saved PTE; unset:swap */
167#define _PAGE_FILE (_AC(1,UL)<<_PAGE_BIT_FILE) 167#define _PAGE_FILE (_AC(1, UL)<<_PAGE_BIT_FILE)
168/* Global TLB entry */ 168/* Global TLB entry */
169#define _PAGE_GLOBAL (_AC(1,UL)<<_PAGE_BIT_GLOBAL) 169#define _PAGE_GLOBAL (_AC(1, UL)<<_PAGE_BIT_GLOBAL)
170 170
171#define _PAGE_PROTNONE 0x080 /* If not present */ 171#define _PAGE_PROTNONE 0x080 /* If not present */
172#define _PAGE_NX (_AC(1,UL)<<_PAGE_BIT_NX) 172#define _PAGE_NX (_AC(1, UL)<<_PAGE_BIT_NX)
173 173
174#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY) 174#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
175#define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY) 175#define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)