lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Fitzhardinge
2009-02-09 00:09:52 -08:00
committed by Jeremy Fitzhardinge
parent e42778de31
commit e2f5bda941
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/include/asm/page_types.h
View File

@@ -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)
} }
#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;

7
arch/x86/include/asm/pgtable.h
View File

@@ -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)
{ {
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