Commit e2f5bda9 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Jeremy Fitzhardinge

x86: define pud_flags and pud_large properly to allow non-PAE builds

parent e42778de
...@@ -90,11 +90,6 @@ static inline pudval_t native_pud_val(pud_t pud) ...@@ -90,11 +90,6 @@ static inline pudval_t native_pud_val(pud_t pud)
#if PAGETABLE_LEVELS > 2 #if PAGETABLE_LEVELS > 2
typedef struct { pmdval_t pmd; } pmd_t; 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) static inline pmd_t native_make_pmd(pmdval_t val)
{ {
return (pmd_t) { val }; return (pmd_t) { val };
...@@ -113,6 +108,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) ...@@ -113,6 +108,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
} }
#endif #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) static inline pmdval_t pmd_flags(pmd_t pmd)
{ {
return native_pmd_val(pmd) & PTE_FLAGS_MASK; return native_pmd_val(pmd) & PTE_FLAGS_MASK;
......
...@@ -398,7 +398,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd) ...@@ -398,7 +398,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd)
static inline int pud_large(pud_t pud) 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); (_PAGE_PSE | _PAGE_PRESENT);
} }
...@@ -406,6 +406,11 @@ static inline int pud_bad(pud_t pud) ...@@ -406,6 +406,11 @@ static inline int pud_bad(pud_t pud)
{ {
return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0;
} }
#else
static inline int pud_large(pud_t pud)
{
return 0;
}
#endif /* PAGETABLE_LEVELS > 2 */ #endif /* PAGETABLE_LEVELS > 2 */
#if PAGETABLE_LEVELS > 3 #if PAGETABLE_LEVELS > 3
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment