diff options
| author | Jeremy Fitzhardinge | 2009-02-05 20:30:52 +0100 |
|---|---|---|
| committer | Jeremy Fitzhardinge | 2009-02-06 21:31:48 +0100 |
| commit | c5f040b12b2381591932a007432e7ed86b3f2796 (patch) | |
| tree | 08712813155d00a6376460654557541ea20b81a1 /arch/x86 | |
| parent | x86: unify pmd_none (diff) | |
| download | kernel-qcow2-linux-c5f040b12b2381591932a007432e7ed86b3f2796.tar.gz kernel-qcow2-linux-c5f040b12b2381591932a007432e7ed86b3f2796.tar.xz kernel-qcow2-linux-c5f040b12b2381591932a007432e7ed86b3f2796.zip | |
x86: unify pgd_page_vaddr
Impact: cleanup
Unify and demacro pgd_page_vaddr.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 2f38bbee77e7..cca4321e0760 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -469,6 +469,11 @@ static inline int pgd_present(pgd_t pgd) { 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 /* __ASSEMBLY__ */ diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index f3ad89433246..4f8dbb99b692 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -179,8 +179,6 @@ static inline int pmd_bad(pmd_t pmd) /* * 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)) static inline int pgd_large(pgd_t pgd) { return 0; } #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) |