x86: define pud_flags and pud_large properly to allow non-PAE builds (e2f5bda9) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/x86/include/asm/page_types.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -90,11 +90,6 @@ static inline pudval_t native_pud_val(pud_t pud)
		#if PAGETABLE_LEVELS > 2
		typedef struct { pmdval_t pmd; } pmd_t;

		static inline pudval_t pud_flags(pud_t pud)
		{
		return native_pud_val(pud) & PTE_FLAGS_MASK;
		}

		static inline pmd_t native_make_pmd(pmdval_t val)
		{
		return (pmd_t) { val };
		@@ -113,6 +108,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
		}
		#endif

		static inline pudval_t pud_flags(pud_t pud)
		{
		return native_pud_val(pud) & PTE_FLAGS_MASK;
		}

		static inline pmdval_t pmd_flags(pmd_t pmd)
		{
		return native_pmd_val(pmd) & PTE_FLAGS_MASK;

+6 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd)

		static inline int pud_large(pud_t pud)
		{
		return (pud_flags(pud) & (_PAGE_PSE \| _PAGE_PRESENT)) ==
		return (pud_val(pud) & (_PAGE_PSE \| _PAGE_PRESENT)) ==
		(_PAGE_PSE \| _PAGE_PRESENT);
		}

		@@ -406,6 +406,11 @@ static inline int pud_bad(pud_t pud)
		{
		return (pud_flags(pud) & ~(_KERNPG_TABLE \| _PAGE_USER)) != 0;
		}
		#else
		static inline int pud_large(pud_t pud)
		{
		return 0;
		}
		#endif /* PAGETABLE_LEVELS > 2 */

		#if PAGETABLE_LEVELS > 3