diff options
| author | Andi Kleen <ak@suse.de> | 2008-01-30 13:33:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:51 +0100 |
| commit | c6ca18eb759c43ae20d953ef90c3de4557f9342a (patch) | |
| tree | dc712340eb1ddd66e0e9cc30de0454345c3558fa /include/asm-x86 | |
| parent | c93c82bbea20bef627dbe8e34a4bc8e526217104 (diff) | |
x86: add pte_pgprot to 32-bit
64bit already had it.
Needed for later patches.
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/pgtable_64.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 0c3ecca0f79..b4ee5939afe 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h @@ -187,6 +187,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) return __pte(val); } +#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX)) + #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #else /* !CONFIG_PARAVIRT */ diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 139da50cd51..df1fcbd12e4 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -120,8 +120,6 @@ static inline void native_pgd_clear(pgd_t * pgd) #define pte_same(a, b) ((a).pte == (b).pte) -#define pte_pgprot(a) (__pgprot((a).pte & ~PHYSICAL_PAGE_MASK)) - #endif /* !__ASSEMBLY__ */ #define PMD_SIZE (_AC(1,UL) << PMD_SHIFT) |