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

Commit 9666e9d4 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: unify pte operations on machine frames 



Xen's pte operations on mfns can be unified like the kernel's pfn operations.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3b4724b0

include/xen/page.h

+15 −15
Original line number Original line Diff line number Diff line
@@ -125,37 +125,37 @@ static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
#define virt_to_mfn(v)		(pfn_to_mfn(PFN_DOWN(__pa(v))))

#define virt_to_mfn(v)		(pfn_to_mfn(PFN_DOWN(__pa(v))))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))





#ifdef CONFIG_X86_PAE

static inline unsigned long pte_mfn(pte_t pte)

#define pte_mfn(_pte) (((_pte).pte_low >> PAGE_SHIFT) |			\

{

		       (((_pte).pte_high & 0xfff) << (32-PAGE_SHIFT)))

	return (pte.pte & ~_PAGE_NX) >> PAGE_SHIFT;

}





static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)

static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)

{

{

	pte_t pte;

	pte_t pte;





	pte.pte_high = (page_nr >> (32 - PAGE_SHIFT)) |

	pte.pte = ((phys_addr_t)page_nr << PAGE_SHIFT) |

		(pgprot_val(pgprot) >> 32);

		(pgprot_val(pgprot) & __supported_pte_mask);

	pte.pte_high &= (__supported_pte_mask >> 32);

	pte.pte_low = ((page_nr << PAGE_SHIFT) | pgprot_val(pgprot));

	pte.pte_low &= __supported_pte_mask;





	return pte;

	return pte;

}

}





static inline unsigned long long pte_val_ma(pte_t x)

static inline pteval_t pte_val_ma(pte_t pte)

{

	return pte.pte;

}



static inline pte_t __pte_ma(pteval_t x)

{

{

	return x.pte;

	return (pte_t) { .pte = x };

}

}



#ifdef CONFIG_X86_PAE

#define pmd_val_ma(v) ((v).pmd)

#define pmd_val_ma(v) ((v).pmd)

#define pud_val_ma(v) ((v).pgd.pgd)

#define pud_val_ma(v) ((v).pgd.pgd)

#define __pte_ma(x)	((pte_t) { .pte = (x) })

#define __pmd_ma(x)	((pmd_t) { (x) } )

#define __pmd_ma(x)	((pmd_t) { (x) } )

#else  /* !X86_PAE */

#else  /* !X86_PAE */

#define pte_mfn(_pte) ((_pte).pte_low >> PAGE_SHIFT)

#define mfn_pte(pfn, prot)	__pte_ma(((pfn) << PAGE_SHIFT) | pgprot_val(prot))

#define pte_val_ma(x)	((x).pte)

#define pmd_val_ma(v)	((v).pud.pgd.pgd)

#define pmd_val_ma(v)	((v).pud.pgd.pgd)

#define __pte_ma(x)	((pte_t) { (x) } )

#endif	/* CONFIG_X86_PAE */

#endif	/* CONFIG_X86_PAE */





#define pgd_val_ma(x)	((x).pgd)

#define pgd_val_ma(x)	((x).pgd)