Bug#414742: Possible fix

["Alexandre Rossi" <alexandre.rossi@gmail.com>]

Hi,

This is fixed for me in v2.6.19

http://bugs.freedesktop.org/show_bug.cgi?id=5085 points to
http://lkml.org/lkml/2006/10/18/68 which is commit
769751f1b920fbd9034a9764443795ce243b547d included in upstream
2.6.19-rc3

It fixes the problem for me. Can you confirm this?

commit 769751f1b920fbd9034a9764443795ce243b547d
Author: bibo,mao <bibo.mao@intel.com>
Date:   Sat Oct 21 18:37:02 2006 +0200

    [PATCH] x86-64: x86_64 add NX mask for PTE entry

        If function change_page_attr_addr calls revert_page to revert
    to original pte value, mk_pte_phys does not mask NX bit. If NX bit
    is set on no NX hardware supported x86_64 machine, there is will
    be RSVD type page fault and system will crash. This patch adds NX
    mask bit for PTE entry.

    Signed-off-by: bibo,mao <bibo.mao@intel.com>
    Signed-off-by: Andi Kleen <ak@suse.de>

diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index a31ab4e..1c35616 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -368,6 +368,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgpr
 {
        pte_t pte;
        pte_val(pte) = physpage | pgprot_val(pgprot);
+       pte_val(pte) &= __supported_pte_mask;
        return pte;
 }