Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 902955fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: revert "x86: fix pmd_bad and pud_bad to support huge pages" 



revert commit cded932b,
"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: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9b5cf48b

include/asm-x86/pgtable_32.h

+1 −3
Original line number Diff line number Diff line
@@ -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))

include/asm-x86/pgtable_64.h

+2 −4
Original line number Diff line number Diff line
@@ -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))