From: Andi Kleen Date: Wed, 30 Jan 2008 12:33:51 +0000 (+0100) Subject: x86: add pte_pgprot to 32-bit X-Git-Tag: v2.6.25-rc1~1143^2~116 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c6ca18eb759c43ae20d953ef90c3de4557f9342a;p=linux-2.6-omap-h63xx.git x86: add pte_pgprot to 32-bit 64bit already had it. Needed for later patches. Signed-off-by: Andi Kleen Acked-by: Jan Beulich Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- 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 #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)