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

Commit 08964c56 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: merge duplicated page table code 



There is a lot of code which is duplicated between the 2 and 3 level
implementation, with the only difference that the 3-level implementation is a
bit more generalized (instead of accessing directly pte_t.pte, it uses the
appropriate access macros).

So this code is joined together.

As obvious, a "core code nice cleanup" is not a "stability-friendly patch" so
usual care applies.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c5600490

include/asm-um/pgtable-2level.h

+0 −27
Original line number Original line Diff line number Diff line
@@ -35,35 +35,8 @@ 
static inline int pgd_newpage(pgd_t pgd)	{ return 0; }

static inline int pgd_newpage(pgd_t pgd)	{ return 0; }

static inline void pgd_mkuptodate(pgd_t pgd)	{ }

static inline void pgd_mkuptodate(pgd_t pgd)	{ }





#define pte_present(x)	(pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))



static inline pte_t pte_mknewprot(pte_t pte)

{

 	pte_val(pte) |= _PAGE_NEWPROT;

	return(pte);

}



static inline pte_t pte_mknewpage(pte_t pte)

{

	pte_val(pte) |= _PAGE_NEWPAGE;

	return(pte);

}



static inline void set_pte(pte_t *pteptr, pte_t pteval)

{

	/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so

	 * fix_range knows to unmap it.  _PAGE_NEWPROT is specific to

	 * mapped pages.

	 */

	*pteptr = pte_mknewpage(pteval);

	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);

}

#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)



#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))

#define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))





#define pte_page(x) pfn_to_page(pte_pfn(x))

#define pte_none(x) !(pte_val(x) & ~_PAGE_NEWPAGE)

#define pte_pfn(x) phys_to_pfn(pte_val(x))

#define pte_pfn(x) phys_to_pfn(pte_val(x))

#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))

#define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))

#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))

#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))

include/asm-um/pgtable-3level.h

+0 −36
Original line number Original line Diff line number Diff line
@@ -57,35 +57,6 @@ static inline int pgd_newpage(pgd_t pgd) 




static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }

static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }







#define pte_present(x)	pte_get_bits(x, (_PAGE_PRESENT | _PAGE_PROTNONE))



static inline pte_t pte_mknewprot(pte_t pte)

{

        pte_set_bits(pte, _PAGE_NEWPROT);

	return(pte);

}



static inline pte_t pte_mknewpage(pte_t pte)

{

	pte_set_bits(pte, _PAGE_NEWPAGE);

	return(pte);

}



static inline void set_pte(pte_t *pteptr, pte_t pteval)

{

	pte_copy(*pteptr, pteval);



	/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so

	 * fix_range knows to unmap it.  _PAGE_NEWPROT is specific to

	 * mapped pages.

	 */



	*pteptr = pte_mknewpage(*pteptr);

	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);

}

#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)



#define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval))

#define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval))





static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
@@ -113,13 +84,6 @@ static inline void pud_clear (pud_t * pud) { } 
#define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \

#define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \

			pmd_index(address))

			pmd_index(address))





#define pte_page(x) pfn_to_page(pte_pfn(x))



static inline int pte_none(pte_t pte)

{

	return pte_is_zero(pte);

}



static inline unsigned long pte_pfn(pte_t pte)

static inline unsigned long pte_pfn(pte_t pte)

{

{

	return phys_to_pfn(pte_val(pte));

	return phys_to_pfn(pte_val(pte));

include/asm-um/pgtable.h

+46 −0
Original line number Original line Diff line number Diff line
@@ -153,10 +153,24 @@ extern unsigned long pg0[1024]; 




#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)

#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)





#define pte_page(x) pfn_to_page(pte_pfn(x))

#define pte_address(x) (__va(pte_val(x) & PAGE_MASK))

#define pte_address(x) (__va(pte_val(x) & PAGE_MASK))

#define mk_phys(a, r) ((a) + (((unsigned long) r) << REGION_SHIFT))

#define mk_phys(a, r) ((a) + (((unsigned long) r) << REGION_SHIFT))

#define phys_addr(p) ((p) & ~REGION_MASK)

#define phys_addr(p) ((p) & ~REGION_MASK)





#define pte_present(x)	pte_get_bits(x, (_PAGE_PRESENT | _PAGE_PROTNONE))



/*

 * =================================

 * Flags checking section.

 * =================================

 */



static inline int pte_none(pte_t pte)

{

	return pte_is_zero(pte);

}



/*

/*

 * The following only work if pte_present() is true.

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 * Undefined behaviour if not..
@@ -212,6 +226,18 @@ static inline int pte_newprot(pte_t pte) 
	return(pte_present(pte) && (pte_get_bits(pte, _PAGE_NEWPROT)));

	return(pte_present(pte) && (pte_get_bits(pte, _PAGE_NEWPROT)));

}

}





/*

 * =================================

 * Flags setting section.

 * =================================

 */



static inline pte_t pte_mknewprot(pte_t pte)

{

	pte_set_bits(pte, _PAGE_NEWPROT);

	return(pte);

}



static inline pte_t pte_rdprotect(pte_t pte)

static inline pte_t pte_rdprotect(pte_t pte)

{ 

{ 

	pte_clear_bits(pte, _PAGE_USER);

	pte_clear_bits(pte, _PAGE_USER);
@@ -280,6 +306,26 @@ static inline pte_t pte_mkuptodate(pte_t pte) 
	return(pte); 

	return(pte); 

}

}





static inline pte_t pte_mknewpage(pte_t pte)

{

	pte_set_bits(pte, _PAGE_NEWPAGE);

	return(pte);

}



static inline void set_pte(pte_t *pteptr, pte_t pteval)

{

	pte_copy(*pteptr, pteval);



	/* If it's a swap entry, it needs to be marked _PAGE_NEWPAGE so

	 * fix_range knows to unmap it.  _PAGE_NEWPROT is specific to

	 * mapped pages.

	 */



	*pteptr = pte_mknewpage(*pteptr);

	if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr);

}

#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)



extern phys_t page_to_phys(struct page *page);

extern phys_t page_to_phys(struct page *page);





/*

/*