From 71dc3935e7ca3da7960697e346cdcaaa949e8a63 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 30 Jan 2008 13:33:51 +0100 Subject: [PATCH] --- yaml --- r: 80459 b: refs/heads/master c: c6ca18eb759c43ae20d953ef90c3de4557f9342a h: refs/heads/master i: 80457: 4a3c5658f2a4fa320c65890eb706dc27a188619c 80455: c23b133f62822e1aca957ce62fa4c6b2ac9c4312 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/pgtable.h | 2 ++ trunk/include/asm-x86/pgtable_64.h | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af86d260c589..e73afdc9c934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c93c82bbea20bef627dbe8e34a4bc8e526217104 +refs/heads/master: c6ca18eb759c43ae20d953ef90c3de4557f9342a diff --git a/trunk/include/asm-x86/pgtable.h b/trunk/include/asm-x86/pgtable.h index 0c3ecca0f79c..b4ee5939afe5 100644 --- a/trunk/include/asm-x86/pgtable.h +++ b/trunk/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/trunk/include/asm-x86/pgtable_64.h b/trunk/include/asm-x86/pgtable_64.h index 139da50cd510..df1fcbd12e43 100644 --- a/trunk/include/asm-x86/pgtable_64.h +++ b/trunk/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)