Commit a632da2f authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar

x86/paravirt: common implementation for pmd value ops

Remove duplicate __pmd/pmd_val functions.
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ef38503e
...@@ -978,18 +978,37 @@ static inline pgdval_t pgd_val(pgd_t pgd) ...@@ -978,18 +978,37 @@ static inline pgdval_t pgd_val(pgd_t pgd)
return ret; return ret;
} }
#ifdef CONFIG_X86_PAE #if PAGETABLE_LEVELS >= 3
static inline pmd_t __pmd(unsigned long long val) static inline pmd_t __pmd(pmdval_t val)
{ {
return (pmd_t) { PVOP_CALL2(unsigned long long, pv_mmu_ops.make_pmd, pmdval_t ret;
val, val >> 32) };
if (sizeof(pmdval_t) > sizeof(long))
ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.make_pmd,
val, (u64)val >> 32);
else
ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.make_pmd,
val);
return (pmd_t) { ret };
} }
static inline unsigned long long pmd_val(pmd_t x) static inline pmdval_t pmd_val(pmd_t pmd)
{ {
return PVOP_CALL2(unsigned long long, pv_mmu_ops.pmd_val, pmdval_t ret;
x.pmd, x.pmd >> 32);
if (sizeof(pmdval_t) > sizeof(long))
ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.pmd_val,
pmd.pmd, (u64)pmd.pmd >> 32);
else
ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.pmd_val,
pmd.pmd);
return ret;
} }
#endif /* PAGETABLE_LEVELS >= 3 */
#ifdef CONFIG_X86_PAE
static inline void set_pte(pte_t *ptep, pte_t pteval) static inline void set_pte(pte_t *ptep, pte_t pteval)
{ {
......
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