pte_modify() got mushed in an apparent mismerge. Fix it up.
Signed-off-by: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
---
include/asm-x86/pgtable.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
--- a/include/asm-x86/pgtable.h
+++ b/include/asm-x86/pgtable.h
@@ -176,14 +176,11 @@ static inline pte_t pte_modify(pte_t pte
{
pteval_t val = pte_val(pte);
- val &= _PAGE_CHG_MASK;
- val |= pgprot_val(newprot);
-
/*
* Chop off the NX bit (if present), and add the NX portion of
* the newprot (if present):
*/
- val &= ~_PAGE_NX;
+ val &= _PAGE_CHG_MASK & ~_PAGE_NX;
val |= pgprot_val(newprot) & __supported_pte_mask;
return __pte(val);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
