lkml.org 
[lkml]   [2008]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 3 of 4] x86: clean up pte_modify
Date
From
pte_modify() got mushed in an apparent mismerge.  Fix it up.

Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>

---
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);



\
 
 \ /
  Last update: 2008-01-15 23:31    [W:0.361 / U:0.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site