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

Commit 45e98cdb authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

page table handling cleanup 



Kill pte_rdprotect(), pte_exprotect(), pte_mkread(), pte_mkexec(), pte_read(),
pte_exec(), and pte_user() except where arch-specific code is making use of
them.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98011f56

arch/sparc/mm/srmmu.c

+0 −4
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ static inline int srmmu_pte_none(pte_t pte) 
static inline int srmmu_pte_present(pte_t pte)

{ return ((pte_val(pte) & SRMMU_ET_MASK) == SRMMU_ET_PTE); }



static inline int srmmu_pte_read(pte_t pte)

{ return !(pte_val(pte) & SRMMU_NOREAD); }



static inline void srmmu_pte_clear(pte_t *ptep)

{ srmmu_set_pte(ptep, __pte(0)); }
@@ -2181,7 +2178,6 @@ void __init ld_mmu_srmmu(void) 


	BTFIXUPSET_CALL(pte_present, srmmu_pte_present, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pte_clear, srmmu_pte_clear, BTFIXUPCALL_SWAPO0G0);

	BTFIXUPSET_CALL(pte_read, srmmu_pte_read, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(pmd_bad, srmmu_pmd_bad, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pmd_present, srmmu_pmd_present, BTFIXUPCALL_NORM);

arch/sparc/mm/sun4c.c

+0 −6
Original line number Diff line number Diff line
@@ -1748,11 +1748,6 @@ static int sun4c_pte_present(pte_t pte) 
}

static void sun4c_pte_clear(pte_t *ptep)	{ *ptep = __pte(0); }



static int sun4c_pte_read(pte_t pte)

{

	return (pte_val(pte) & _SUN4C_PAGE_READ);

}



static int sun4c_pmd_bad(pmd_t pmd)

{

	return (((pmd_val(pmd) & ~PAGE_MASK) != PGD_TABLE) ||
@@ -2212,7 +2207,6 @@ void __init ld_mmu_sun4c(void) 


	BTFIXUPSET_CALL(pte_present, sun4c_pte_present, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pte_clear, sun4c_pte_clear, BTFIXUPCALL_STG0O0);

	BTFIXUPSET_CALL(pte_read, sun4c_pte_read, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(pmd_bad, sun4c_pmd_bad, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pmd_present, sun4c_pmd_present, BTFIXUPCALL_NORM);

include/asm-alpha/pgtable.h

+0 −6
Original line number Diff line number Diff line
@@ -264,21 +264,15 @@ extern inline void pgd_clear(pgd_t * pgdp) { pgd_val(*pgdp) = 0; } 
 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

extern inline int pte_read(pte_t pte)		{ return !(pte_val(pte) & _PAGE_FOR); }

extern inline int pte_write(pte_t pte)		{ return !(pte_val(pte) & _PAGE_FOW); }

extern inline int pte_exec(pte_t pte)		{ return !(pte_val(pte) & _PAGE_FOE); }

extern inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

extern inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

extern inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }



extern inline pte_t pte_wrprotect(pte_t pte)	{ pte_val(pte) |= _PAGE_FOW; return pte; }

extern inline pte_t pte_rdprotect(pte_t pte)	{ pte_val(pte) |= _PAGE_FOR; return pte; }

extern inline pte_t pte_exprotect(pte_t pte)	{ pte_val(pte) |= _PAGE_FOE; return pte; }

extern inline pte_t pte_mkclean(pte_t pte)	{ pte_val(pte) &= ~(__DIRTY_BITS); return pte; }

extern inline pte_t pte_mkold(pte_t pte)	{ pte_val(pte) &= ~(__ACCESS_BITS); return pte; }

extern inline pte_t pte_mkwrite(pte_t pte)	{ pte_val(pte) &= ~_PAGE_FOW; return pte; }

extern inline pte_t pte_mkread(pte_t pte)	{ pte_val(pte) &= ~_PAGE_FOR; return pte; }

extern inline pte_t pte_mkexec(pte_t pte)	{ pte_val(pte) &= ~_PAGE_FOE; return pte; }

extern inline pte_t pte_mkdirty(pte_t pte)	{ pte_val(pte) |= __DIRTY_BITS; return pte; }

extern inline pte_t pte_mkyoung(pte_t pte)	{ pte_val(pte) |= __ACCESS_BITS; return pte; }

include/asm-arm/pgtable.h

+0 −6
Original line number Diff line number Diff line
@@ -257,9 +257,7 @@ extern struct page *empty_zero_page; 
 * Undefined behaviour if not..

 */

#define pte_present(pte)	(pte_val(pte) & L_PTE_PRESENT)

#define pte_read(pte)		(pte_val(pte) & L_PTE_USER)

#define pte_write(pte)		(pte_val(pte) & L_PTE_WRITE)

#define pte_exec(pte)		(pte_val(pte) & L_PTE_EXEC)

#define pte_dirty(pte)		(pte_val(pte) & L_PTE_DIRTY)

#define pte_young(pte)		(pte_val(pte) & L_PTE_YOUNG)
@@ -275,12 +273,8 @@ extern struct page *empty_zero_page; 
#define PTE_BIT_FUNC(fn,op) \

static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }



/*PTE_BIT_FUNC(rdprotect, &= ~L_PTE_USER);*/

/*PTE_BIT_FUNC(mkread,    |= L_PTE_USER);*/

PTE_BIT_FUNC(wrprotect, &= ~L_PTE_WRITE);

PTE_BIT_FUNC(mkwrite,   |= L_PTE_WRITE);

PTE_BIT_FUNC(exprotect, &= ~L_PTE_EXEC);

PTE_BIT_FUNC(mkexec,    |= L_PTE_EXEC);

PTE_BIT_FUNC(mkclean,   &= ~L_PTE_DIRTY);

PTE_BIT_FUNC(mkdirty,   |= L_PTE_DIRTY);

PTE_BIT_FUNC(mkold,     &= ~L_PTE_YOUNG);

include/asm-arm26/pgtable.h

+0 −4
Original line number Diff line number Diff line
@@ -218,9 +218,7 @@ extern struct page *empty_zero_page; 
 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

#define pte_read(pte)                   (!(pte_val(pte) & _PAGE_NOT_USER))

#define pte_write(pte)                  (!(pte_val(pte) & _PAGE_READONLY))

#define pte_exec(pte)                   (!(pte_val(pte) & _PAGE_NOT_USER))

#define pte_dirty(pte)                  (!(pte_val(pte) & _PAGE_CLEAN))

#define pte_young(pte)                  (!(pte_val(pte) & _PAGE_OLD))

//ONLY when !pte_present() I think. nicked from arm32 (FIXME!)
@@ -231,8 +229,6 @@ static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; } 


PTE_BIT_FUNC(wrprotect, |=  _PAGE_READONLY);

PTE_BIT_FUNC(mkwrite,   &= ~_PAGE_READONLY);

PTE_BIT_FUNC(exprotect, |=  _PAGE_NOT_USER);

PTE_BIT_FUNC(mkexec,    &= ~_PAGE_NOT_USER);

PTE_BIT_FUNC(mkclean,   |=  _PAGE_CLEAN);

PTE_BIT_FUNC(mkdirty,   &= ~_PAGE_CLEAN);

PTE_BIT_FUNC(mkold,     |=  _PAGE_OLD);