Commit:     c3bcfb57e1e64b9b2f8b2d90564826637e21c5ea
Parent:     4614139c6a74fe02c85f702ba9c0e57f8e38647e
Author:     Jeremy Fitzhardinge <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:32:57 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:32:57 2008 +0100

    x86: mask NX from pte_pfn
    In 32-bit PAE, mask NX from pte_pfn, since it isn't part of the PFN.
    This code is due for unification anyway, but this fixes a latent bug.
    Signed-off-by: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 include/asm-x86/pgtable-3level.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-x86/pgtable-3level.h b/include/asm-x86/pgtable-3level.h
index 948a334..9816346 100644
--- a/include/asm-x86/pgtable-3level.h
+++ b/include/asm-x86/pgtable-3level.h
@@ -155,7 +155,7 @@ static inline int pte_none(pte_t pte)
 static inline unsigned long pte_pfn(pte_t pte)
-       return pte_val(pte) >> PAGE_SHIFT;
+       return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT;
 extern unsigned long long __supported_pte_mask;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to