Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH] [10/36] Add pte_pgprot on i386 | Date | Wed, 16 Jan 2008 23:15:08 +0100 (CET) |
| |
64bit already had it.
Needed for later patches.
Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Jan Beulich <jbeulich@novell.com>
--- include/asm-x86/pgtable.h | 2 ++ include/asm-x86/pgtable_64.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux/include/asm-x86/pgtable.h =================================================================== --- linux.orig/include/asm-x86/pgtable.h +++ linux/include/asm-x86/pgtable.h @@ -191,6 +191,8 @@ static inline pte_t pte_modify(pte_t pte return __pte(val); } +#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX)) + #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #else /* !CONFIG_PARAVIRT */ Index: linux/include/asm-x86/pgtable_64.h =================================================================== --- linux.orig/include/asm-x86/pgtable_64.h +++ linux/include/asm-x86/pgtable_64.h @@ -120,8 +120,6 @@ static inline void native_pgd_clear(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)
| |