Commit 5b8dd1e9 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86/paravirt: rearrange common mmu_ops 



Rearrange the various pagetable mmu_ops to remove duplication.

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 2f98b2fa

include/asm-x86/paravirt.h

+17 −13
Original line number Diff line number Diff line
@@ -230,28 +230,32 @@ struct pv_mmu_ops { 
	void (*pte_update_defer)(struct mm_struct *mm,

				 unsigned long addr, pte_t *ptep);



	pteval_t (*pte_val)(pte_t);

	pte_t (*make_pte)(pteval_t pte);



	pgdval_t (*pgd_val)(pgd_t);

	pgd_t (*make_pgd)(pgdval_t pgd);



#if PAGETABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

	void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);

	void (*set_pte_present)(struct mm_struct *mm, unsigned long addr,

				pte_t *ptep, pte_t pte);

	void (*set_pud)(pud_t *pudp, pud_t pudval);

	void (*pte_clear)(struct mm_struct *mm, unsigned long addr, pte_t *ptep);

	void (*pmd_clear)(pmd_t *pmdp);



	unsigned long long (*pte_val)(pte_t);

	unsigned long long (*pmd_val)(pmd_t);

	unsigned long long (*pgd_val)(pgd_t);

#endif	/* CONFIG_X86_PAE */



	void (*set_pud)(pud_t *pudp, pud_t pudval);



	pte_t (*make_pte)(unsigned long long pte);

	pmd_t (*make_pmd)(unsigned long long pmd);

	pgd_t (*make_pgd)(unsigned long long pgd);

#else

	unsigned long (*pte_val)(pte_t);

	unsigned long (*pgd_val)(pgd_t);

	pmdval_t (*pmd_val)(pmd_t);

	pmd_t (*make_pmd)(pmdval_t pmd);



	pte_t (*make_pte)(unsigned long pte);

	pgd_t (*make_pgd)(unsigned long pgd);

#endif

#if PAGETABLE_LEVELS == 4

	pudval_t (*pud_val)(pud_t);

	pud_t (*make_pud)(pudval_t pud);

#endif	/* PAGETABLE_LEVELS == 4 */

#endif	/* PAGETABLE_LEVELS >= 3 */



#ifdef CONFIG_HIGHPTE

	void *(*kmap_atomic_pte)(struct page *page, enum km_type type);