diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-03-03 13:53:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-03-03 14:18:27 +0100 |
| commit | 902955fc13259dcec1321d45251a477977fcba39 (patch) | |
| tree | e9812c743b2e0f601486c9bb64525f24d4ac0fc4 /include/asm-x86/pgtable_64.h | |
| parent | x86: revert "x86: CPA: avoid split of alias mappings" (diff) | |
| download | linux-902955fc13259dcec1321d45251a477977fcba39.tar.xz linux-902955fc13259dcec1321d45251a477977fcba39.zip | |
x86: revert "x86: fix pmd_bad and pud_bad to support huge pages"
revert commit cded932b75ab0a5f9181ee3da34a0a488d1a14fd,
"x86: fix pmd_bad and pud_bad to support huge pages", it causes
a bootup hang, as reported and bisected by Arjan van de Ven.
Bisected-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
| -rw-r--r-- | include/asm-x86/pgtable_64.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 0a9258333cbd..0a0b77bc736a 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -153,14 +153,12 @@ 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 | _PAGE_PSE | _PAGE_NX); + return pud_val(pud) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); } static inline unsigned long pmd_bad(pmd_t pmd) { - return pmd_val(pmd) & - ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER | _PAGE_PSE | _PAGE_NX); + return pmd_val(pmd) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER); } #define pte_none(x) (!pte_val(x)) |