x86: redo cded932b75
redo commit cded932b75
.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
ba748d221e
commit
40869cd038
2 changed files with 7 additions and 3 deletions
|
@ -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))
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in a new issue