|
@@ -655,15 +655,15 @@ static void xen_write_cr3(unsigned long cr3)
|
|
|
|
|
|
/* Early in boot, while setting up the initial pagetable, assume
|
|
|
everything is pinned. */
|
|
|
-static __init void xen_alloc_pt_init(struct mm_struct *mm, u32 pfn)
|
|
|
+static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn)
|
|
|
{
|
|
|
BUG_ON(mem_map); /* should only be used early */
|
|
|
make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
|
|
|
}
|
|
|
|
|
|
-/* Early release_pt assumes that all pts are pinned, since there's
|
|
|
+/* Early release_pte assumes that all pts are pinned, since there's
|
|
|
only init_mm and anything attached to that is pinned. */
|
|
|
-static void xen_release_pt_init(u32 pfn)
|
|
|
+static void xen_release_pte_init(u32 pfn)
|
|
|
{
|
|
|
make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
|
|
|
}
|
|
@@ -697,12 +697,12 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void xen_alloc_pt(struct mm_struct *mm, u32 pfn)
|
|
|
+static void xen_alloc_pte(struct mm_struct *mm, u32 pfn)
|
|
|
{
|
|
|
xen_alloc_ptpage(mm, pfn, PT_PTE);
|
|
|
}
|
|
|
|
|
|
-static void xen_alloc_pd(struct mm_struct *mm, u32 pfn)
|
|
|
+static void xen_alloc_pmd(struct mm_struct *mm, u32 pfn)
|
|
|
{
|
|
|
xen_alloc_ptpage(mm, pfn, PT_PMD);
|
|
|
}
|
|
@@ -722,12 +722,12 @@ static void xen_release_ptpage(u32 pfn, unsigned level)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void xen_release_pt(u32 pfn)
|
|
|
+static void xen_release_pte(u32 pfn)
|
|
|
{
|
|
|
xen_release_ptpage(pfn, PT_PTE);
|
|
|
}
|
|
|
|
|
|
-static void xen_release_pd(u32 pfn)
|
|
|
+static void xen_release_pmd(u32 pfn)
|
|
|
{
|
|
|
xen_release_ptpage(pfn, PT_PMD);
|
|
|
}
|
|
@@ -849,10 +849,10 @@ static __init void xen_pagetable_setup_done(pgd_t *base)
|
|
|
{
|
|
|
/* This will work as long as patching hasn't happened yet
|
|
|
(which it hasn't) */
|
|
|
- pv_mmu_ops.alloc_pt = xen_alloc_pt;
|
|
|
- pv_mmu_ops.alloc_pd = xen_alloc_pd;
|
|
|
- pv_mmu_ops.release_pt = xen_release_pt;
|
|
|
- pv_mmu_ops.release_pd = xen_release_pd;
|
|
|
+ pv_mmu_ops.alloc_pte = xen_alloc_pte;
|
|
|
+ pv_mmu_ops.alloc_pmd = xen_alloc_pmd;
|
|
|
+ pv_mmu_ops.release_pte = xen_release_pte;
|
|
|
+ pv_mmu_ops.release_pmd = xen_release_pmd;
|
|
|
pv_mmu_ops.set_pte = xen_set_pte;
|
|
|
|
|
|
setup_shared_info();
|
|
@@ -1059,11 +1059,11 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {
|
|
|
.pte_update = paravirt_nop,
|
|
|
.pte_update_defer = paravirt_nop,
|
|
|
|
|
|
- .alloc_pt = xen_alloc_pt_init,
|
|
|
- .release_pt = xen_release_pt_init,
|
|
|
- .alloc_pd = xen_alloc_pt_init,
|
|
|
- .alloc_pd_clone = paravirt_nop,
|
|
|
- .release_pd = xen_release_pt_init,
|
|
|
+ .alloc_pte = xen_alloc_pte_init,
|
|
|
+ .release_pte = xen_release_pte_init,
|
|
|
+ .alloc_pmd = xen_alloc_pte_init,
|
|
|
+ .alloc_pmd_clone = paravirt_nop,
|
|
|
+ .release_pmd = xen_release_pte_init,
|
|
|
|
|
|
#ifdef CONFIG_HIGHPTE
|
|
|
.kmap_atomic_pte = xen_kmap_atomic_pte,
|