|
@@ -434,14 +434,13 @@ static void xen_set_pud(pud_t *ptr, pud_t val)
|
|
static void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
|
|
static void xen_set_pte_atomic(pte_t *ptep, pte_t pte)
|
|
{
|
|
{
|
|
trace_xen_mmu_set_pte_atomic(ptep, pte);
|
|
trace_xen_mmu_set_pte_atomic(ptep, pte);
|
|
- set_64bit((u64 *)ptep, native_pte_val(pte));
|
|
|
|
|
|
+ __xen_set_pte(ptep, pte);
|
|
}
|
|
}
|
|
|
|
|
|
static void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
|
static void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
|
|
{
|
|
{
|
|
trace_xen_mmu_pte_clear(mm, addr, ptep);
|
|
trace_xen_mmu_pte_clear(mm, addr, ptep);
|
|
- if (!xen_batched_set_pte(ptep, native_make_pte(0)))
|
|
|
|
- native_pte_clear(mm, addr, ptep);
|
|
|
|
|
|
+ __xen_set_pte(ptep, native_make_pte(0));
|
|
}
|
|
}
|
|
|
|
|
|
static void xen_pmd_clear(pmd_t *pmdp)
|
|
static void xen_pmd_clear(pmd_t *pmdp)
|
|
@@ -1569,7 +1568,7 @@ static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
|
|
pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
|
|
pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) &
|
|
pte_val_ma(pte));
|
|
pte_val_ma(pte));
|
|
#endif
|
|
#endif
|
|
- native_set_pte(ptep, pte);
|
|
|
|
|
|
+ __xen_set_pte(ptep, pte);
|
|
}
|
|
}
|
|
|
|
|
|
/* Early in boot, while setting up the initial pagetable, assume
|
|
/* Early in boot, while setting up the initial pagetable, assume
|