Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79938
b: refs/heads/master
c: 929fd58
h: refs/heads/master
v: v3
  • Loading branch information
Joerg Roedel authored and Ingo Molnar committed Jan 30, 2008
1 parent 2863943 commit 93d9c18
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 954683a2c19696114894384e34f858bb9f455b11
refs/heads/master: 929fd589135ed417663f1b75b8031c9cf6687700
2 changes: 1 addition & 1 deletion trunk/arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 | __PAGE_KERNEL_LARGE_EXEC));
set_pmd(pmd+i, __pmd(addr | __PAGE_KERNEL_LARGE_EXEC));
__flush_tlb();
return (void *)vaddr;
next:
Expand Down
22 changes: 11 additions & 11 deletions trunk/include/asm-x86/pgtable_64.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,22 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
#define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
#define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */

#define _PAGE_PRESENT (_AC(1,UL)<<_PAGE_BIT_PRESENT)
#define _PAGE_RW (_AC(1,UL)<<_PAGE_BIT_RW)
#define _PAGE_USER (_AC(1,UL)<<_PAGE_BIT_USER)
#define _PAGE_PWT (_AC(1,UL)<<_PAGE_BIT_PWT)
#define _PAGE_PCD (_AC(1,UL)<<_PAGE_BIT_PCD)
#define _PAGE_ACCESSED (_AC(1,UL)<<_PAGE_BIT_ACCESSED)
#define _PAGE_DIRTY (_AC(1,UL)<<_PAGE_BIT_DIRTY)
#define _PAGE_PRESENT (_AC(1, UL)<<_PAGE_BIT_PRESENT)
#define _PAGE_RW (_AC(1, UL)<<_PAGE_BIT_RW)
#define _PAGE_USER (_AC(1, UL)<<_PAGE_BIT_USER)
#define _PAGE_PWT (_AC(1, UL)<<_PAGE_BIT_PWT)
#define _PAGE_PCD (_AC(1, UL)<<_PAGE_BIT_PCD)
#define _PAGE_ACCESSED (_AC(1, UL)<<_PAGE_BIT_ACCESSED)
#define _PAGE_DIRTY (_AC(1, UL)<<_PAGE_BIT_DIRTY)
/* 2MB page */
#define _PAGE_PSE (_AC(1,UL)<<_PAGE_BIT_PSE)
#define _PAGE_PSE (_AC(1, UL)<<_PAGE_BIT_PSE)
/* nonlinear file mapping, saved PTE; unset:swap */
#define _PAGE_FILE (_AC(1,UL)<<_PAGE_BIT_FILE)
#define _PAGE_FILE (_AC(1, UL)<<_PAGE_BIT_FILE)
/* Global TLB entry */
#define _PAGE_GLOBAL (_AC(1,UL)<<_PAGE_BIT_GLOBAL)
#define _PAGE_GLOBAL (_AC(1, UL)<<_PAGE_BIT_GLOBAL)

#define _PAGE_PROTNONE 0x080 /* If not present */
#define _PAGE_NX (_AC(1,UL)<<_PAGE_BIT_NX)
#define _PAGE_NX (_AC(1, UL)<<_PAGE_BIT_NX)

#define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
#define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
Expand Down

0 comments on commit 93d9c18

Please sign in to comment.