Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6944a9c8 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: rename paravirt_alloc_pt etc after the pagetable structure 



Rename (alloc|release)_(pt|pd) to pte/pmd to explicitly match the name
of the appropriate pagetable level structure.

[ x86.git merge work by Mark McLoughlin <markmc@redhat.com> ]

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 39415855

arch/x86/kernel/paravirt.c

+5 −5
Original line number Diff line number Diff line
@@ -366,11 +366,11 @@ struct pv_mmu_ops pv_mmu_ops = { 
	.flush_tlb_single = native_flush_tlb_single,

	.flush_tlb_others = native_flush_tlb_others,



	.alloc_pt = paravirt_nop,

	.alloc_pd = paravirt_nop,

	.alloc_pd_clone = paravirt_nop,

	.release_pt = paravirt_nop,

	.release_pd = paravirt_nop,

	.alloc_pte = paravirt_nop,

	.alloc_pmd = paravirt_nop,

	.alloc_pmd_clone = paravirt_nop,

	.release_pte = paravirt_nop,

	.release_pmd = paravirt_nop,



	.set_pte = native_set_pte,

	.set_pte_at = native_set_pte_at,

arch/x86/kernel/vmi_32.c

+10 −10
Original line number Diff line number Diff line
@@ -392,13 +392,13 @@ static void *vmi_kmap_atomic_pte(struct page *page, enum km_type type) 
}

#endif



static void vmi_allocate_pt(struct mm_struct *mm, u32 pfn)

static void vmi_allocate_pte(struct mm_struct *mm, u32 pfn)

{

	vmi_set_page_type(pfn, VMI_PAGE_L1);

	vmi_ops.allocate_page(pfn, VMI_PAGE_L1, 0, 0, 0);

}



static void vmi_allocate_pd(struct mm_struct *mm, u32 pfn)

static void vmi_allocate_pmd(struct mm_struct *mm, u32 pfn)

{

 	/*

	 * This call comes in very early, before mem_map is setup.
@@ -409,20 +409,20 @@ static void vmi_allocate_pd(struct mm_struct *mm, u32 pfn) 
	vmi_ops.allocate_page(pfn, VMI_PAGE_L2, 0, 0, 0);

}



static void vmi_allocate_pd_clone(u32 pfn, u32 clonepfn, u32 start, u32 count)

static void vmi_allocate_pmd_clone(u32 pfn, u32 clonepfn, u32 start, u32 count)

{

 	vmi_set_page_type(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE);

	vmi_check_page_type(clonepfn, VMI_PAGE_L2);

	vmi_ops.allocate_page(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE, clonepfn, start, count);

}



static void vmi_release_pt(u32 pfn)

static void vmi_release_pte(u32 pfn)

{

	vmi_ops.release_page(pfn, VMI_PAGE_L1);

	vmi_set_page_type(pfn, VMI_PAGE_NORMAL);

}



static void vmi_release_pd(u32 pfn)

static void vmi_release_pmd(u32 pfn)

{

	vmi_ops.release_page(pfn, VMI_PAGE_L2);

	vmi_set_page_type(pfn, VMI_PAGE_NORMAL);
@@ -871,15 +871,15 @@ static inline int __init activate_vmi(void) 


	vmi_ops.allocate_page = vmi_get_function(VMI_CALL_AllocatePage);

	if (vmi_ops.allocate_page) {

		pv_mmu_ops.alloc_pt = vmi_allocate_pt;

		pv_mmu_ops.alloc_pd = vmi_allocate_pd;

		pv_mmu_ops.alloc_pd_clone = vmi_allocate_pd_clone;

		pv_mmu_ops.alloc_pte = vmi_allocate_pte;

		pv_mmu_ops.alloc_pmd = vmi_allocate_pmd;

		pv_mmu_ops.alloc_pmd_clone = vmi_allocate_pmd_clone;

	}



	vmi_ops.release_page = vmi_get_function(VMI_CALL_ReleasePage);

	if (vmi_ops.release_page) {

		pv_mmu_ops.release_pt = vmi_release_pt;

		pv_mmu_ops.release_pd = vmi_release_pd;

		pv_mmu_ops.release_pte = vmi_release_pte;

		pv_mmu_ops.release_pmd = vmi_release_pmd;

	}



	/* Set linear is needed in all cases */

arch/x86/mm/init_32.c

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static pmd_t * __init one_md_table_init(pgd_t *pgd) 
	if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {

		pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);



		paravirt_alloc_pd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);

		paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);

		set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));

		pud = pud_offset(pgd, 0);

		BUG_ON(pmd_table != pmd_offset(pud, 0));
@@ -100,7 +100,7 @@ static pte_t * __init one_page_table_init(pmd_t *pmd) 
				(pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);

		}



		paravirt_alloc_pt(&init_mm, __pa(page_table) >> PAGE_SHIFT);

		paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);

		set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));

		BUG_ON(page_table != pte_offset_kernel(pmd, 0));

	}
@@ -365,7 +365,7 @@ void __init native_pagetable_setup_start(pgd_t *base) 


		pte_clear(NULL, va, pte);

	}

	paravirt_alloc_pd(&init_mm, __pa(base) >> PAGE_SHIFT);

	paravirt_alloc_pmd(&init_mm, __pa(base) >> PAGE_SHIFT);

}



void __init native_pagetable_setup_done(pgd_t *base)

arch/x86/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ void __init early_ioremap_clear(void) 


	pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));

	pmd_clear(pmd);

	paravirt_release_pt(__pa(bm_pte) >> PAGE_SHIFT);

	paravirt_release_pte(__pa(bm_pte) >> PAGE_SHIFT);

	__flush_tlb_all();

}

arch/x86/mm/pageattr.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int split_large_page(pte_t *kpte, unsigned long address) 
		goto out_unlock;



	pbase = (pte_t *)page_address(base);

	paravirt_alloc_pt(&init_mm, page_to_pfn(base));

	paravirt_alloc_pte(&init_mm, page_to_pfn(base));

	ref_prot = pte_pgprot(pte_clrhuge(*kpte));



#ifdef CONFIG_X86_64