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

x86: unify pgd_page_vaddr

Browse Source 
Impact: cleanup

Unify and demacro pgd_page_vaddr.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
This commit is contained in:
Jeremy Fitzhardinge
2009-02-05 11:30:52 -08:00
parent 4fea801ac9
commit c5f040b12b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,6 +469,11 @@ static inline int pgd_present(pgd_t pgd)
{ {
return pgd_val(pgd) & _PAGE_PRESENT; return pgd_val(pgd) & _PAGE_PRESENT;
} }
static inline unsigned long pgd_page_vaddr(pgd_t pgd)
{
return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
}
#endif /* PAGETABLE_LEVELS > 3 */ #endif /* PAGETABLE_LEVELS > 3 */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

2
arch/x86/include/asm/pgtable_64.h
View File

@@ -179,8 +179,6 @@ static inline int pmd_bad(pmd_t pmd)
/* /*
* Level 4 access. * Level 4 access.
*/ */
#define pgd_page_vaddr(pgd) \
((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK))
#define pgd_page(pgd) (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT)) #define pgd_page(pgd) (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))
static inline int pgd_large(pgd_t pgd) { return 0; } static inline int pgd_large(pgd_t pgd) { return 0; }
#define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)