Commit 773221f4 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar

x86/paravirt: common implementation for pte value ops

Remove duplicate __pte/pte_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 5b8dd1e9
...@@ -920,15 +920,37 @@ static inline void pte_update_defer(struct mm_struct *mm, unsigned long addr, ...@@ -920,15 +920,37 @@ static inline void pte_update_defer(struct mm_struct *mm, unsigned long addr,
PVOP_VCALL3(pv_mmu_ops.pte_update_defer, mm, addr, ptep); PVOP_VCALL3(pv_mmu_ops.pte_update_defer, mm, addr, ptep);
} }
#ifdef CONFIG_X86_PAE static inline pte_t __pte(pteval_t val)
static inline pte_t __pte(unsigned long long val)
{ {
unsigned long long ret = PVOP_CALL2(unsigned long long, pteval_t ret;
if (sizeof(pteval_t) > sizeof(long))
ret = PVOP_CALL2(pteval_t,
pv_mmu_ops.make_pte,
val, (u64)val >> 32);
else
ret = PVOP_CALL1(pteval_t,
pv_mmu_ops.make_pte, pv_mmu_ops.make_pte,
val, val >> 32); val);
return (pte_t) { .pte = ret }; return (pte_t) { .pte = ret };
} }
static inline pteval_t pte_val(pte_t pte)
{
pteval_t ret;
if (sizeof(pteval_t) > sizeof(long))
ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_val,
pte.pte, (u64)pte.pte >> 32);
else
ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_val,
pte.pte);
return ret;
}
#ifdef CONFIG_X86_PAE
static inline pmd_t __pmd(unsigned long long val) static inline pmd_t __pmd(unsigned long long val)
{ {
return (pmd_t) { PVOP_CALL2(unsigned long long, pv_mmu_ops.make_pmd, return (pmd_t) { PVOP_CALL2(unsigned long long, pv_mmu_ops.make_pmd,
...@@ -941,12 +963,6 @@ static inline pgd_t __pgd(unsigned long long val) ...@@ -941,12 +963,6 @@ static inline pgd_t __pgd(unsigned long long val)
val, val >> 32) }; val, val >> 32) };
} }
static inline unsigned long long pte_val(pte_t x)
{
return PVOP_CALL2(unsigned long long, pv_mmu_ops.pte_val,
x.pte_low, x.pte_high);
}
static inline unsigned long long pmd_val(pmd_t x) static inline unsigned long long pmd_val(pmd_t x)
{ {
return PVOP_CALL2(unsigned long long, pv_mmu_ops.pmd_val, return PVOP_CALL2(unsigned long long, pv_mmu_ops.pmd_val,
...@@ -1008,21 +1024,11 @@ static inline void pmd_clear(pmd_t *pmdp) ...@@ -1008,21 +1024,11 @@ static inline void pmd_clear(pmd_t *pmdp)
#else /* !CONFIG_X86_PAE */ #else /* !CONFIG_X86_PAE */
static inline pte_t __pte(unsigned long val)
{
return (pte_t) { PVOP_CALL1(unsigned long, pv_mmu_ops.make_pte, val) };
}
static inline pgd_t __pgd(unsigned long val) static inline pgd_t __pgd(unsigned long val)
{ {
return (pgd_t) { PVOP_CALL1(unsigned long, pv_mmu_ops.make_pgd, val) }; return (pgd_t) { PVOP_CALL1(unsigned long, pv_mmu_ops.make_pgd, val) };
} }
static inline unsigned long pte_val(pte_t x)
{
return PVOP_CALL1(unsigned long, pv_mmu_ops.pte_val, x.pte_low);
}
static inline unsigned long pgd_val(pgd_t x) static inline unsigned long pgd_val(pgd_t x)
{ {
return PVOP_CALL1(unsigned long, pv_mmu_ops.pgd_val, x.pgd); return PVOP_CALL1(unsigned long, pv_mmu_ops.pgd_val, x.pgd);
......
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