diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-04 04:22:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-04 04:22:00 +0000 |
| commit | 966ea8c4b74aa6fde2d58c50a904619fd849ae93 (patch) | |
| tree | 15f02bbcf6112575dbec30c3f7603a393b4dee3a /include/asm-x86/pgtable_32.h | |
| parent | 41c5ae6898454277ec88e8e7278c8c58026363a3 (diff) | |
| parent | 976dde010e513a9c7c3117a32b7b015f84b37430 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86/pgtable_32.h')
| -rw-r--r-- | include/asm-x86/pgtable_32.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index b478efa971e..a842c7222b1 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h @@ -91,9 +91,7 @@ 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 | _PAGE_PSE | _PAGE_NX)) \ - != _KERNPG_TABLE) +#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) |