summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/pgtable_32.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-03-03 13:55:32 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:52 +0200
commit40869cd038a0ecb867a7227aba46806224e4d11d (patch)
treea51c2bf4358a1507370a689759ed554562e85812 /include/asm-x86/pgtable_32.h
parentx86: warn about RAM pages in ioremap() (diff)
downloadlinux-40869cd038a0ecb867a7227aba46806224e4d11d.tar.xz
linux-40869cd038a0ecb867a7227aba46806224e4d11d.zip
x86: redo cded932b75ab0a5f9181e
redo commit cded932b75ab0a5f9181e. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/pgtable_32.h')
-rw-r--r--include/asm-x86/pgtable_32.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index 4e6a0fca0b47..997c36c6b4d7 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -90,7 +90,9 @@ extern unsigned long pg0[];
/* To avoid harmful races, pmd_none(x) should check only the lower when PAE */
#define pmd_none(x) (!(unsigned long)pmd_val(x))
#define pmd_present(x) (pmd_val(x) & _PAGE_PRESENT)
-#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+#define pmd_bad(x) ((pmd_val(x) \
+ & ~(PAGE_MASK | _PAGE_USER | _PAGE_PSE | _PAGE_NX)) \
+ != _KERNPG_TABLE)
#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))