diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-03-03 13:55:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:52 +0200 |
commit | 40869cd038a0ecb867a7227aba46806224e4d11d (patch) | |
tree | a51c2bf4358a1507370a689759ed554562e85812 /include/asm-x86/pgtable_64.h | |
parent | ba748d221eb74b849453a94fdf0e1d0566b407d7 (diff) | |
download | blackbird-op-linux-40869cd038a0ecb867a7227aba46806224e4d11d.tar.gz blackbird-op-linux-40869cd038a0ecb867a7227aba46806224e4d11d.zip |
x86: redo cded932b75ab0a5f9181e
redo commit cded932b75ab0a5f9181e.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/pgtable_64.h')
-rw-r--r-- | include/asm-x86/pgtable_64.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 6ef09914acbe..0a5081c98ae1 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -153,12 +153,14 @@ static inline unsigned long pgd_bad(pgd_t pgd) static inline unsigned long pud_bad(pud_t pud) { - return pud_val(pud) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); + return pud_val(pud) & + ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER | _PAGE_PSE | _PAGE_NX); } static inline unsigned long pmd_bad(pmd_t pmd) { - return pmd_val(pmd) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); + return pmd_val(pmd) & + ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER | _PAGE_PSE | _PAGE_NX); } #define pte_none(x) (!pte_val(x)) |