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

Commit f167edae authored by David S. Miller's avatar David S. Miller
Browse files

sparc32: Un-btfixup pmd_{bad,present}(). 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d9fa4aa

arch/sparc/include/asm/pgtable_32.h

+9 −5
Original line number Diff line number Diff line
@@ -153,17 +153,21 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt 
	__pte_clear(ptep);

}



BTFIXUPDEF_CALL_CONST(int, pmd_bad, pmd_t)

BTFIXUPDEF_CALL_CONST(int, pmd_present, pmd_t)

static inline int pmd_bad(pmd_t pmd)

{

	return (pmd_val(pmd) & SRMMU_ET_MASK) != SRMMU_ET_PTD;

}



static inline int pmd_present(pmd_t pmd)

{

	return ((pmd_val(pmd) & SRMMU_ET_MASK) == SRMMU_ET_PTD);

}



static inline int pmd_none(pmd_t pmd)

{

	return !pmd_val(pmd);

}



#define pmd_bad(pmd) BTFIXUP_CALL(pmd_bad)(pmd)

#define pmd_present(pmd) BTFIXUP_CALL(pmd_present)(pmd)



static inline void pmd_clear(pmd_t *pmdp)

{

	int i;

arch/sparc/mm/srmmu.c

+0 −9
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ static inline int srmmu_pte_present(pte_t pte) 
static inline int srmmu_pmd_none(pmd_t pmd)

{ return !(pmd_val(pmd) & 0xFFFFFFF); }



static inline int srmmu_pmd_bad(pmd_t pmd)

{ return (pmd_val(pmd) & SRMMU_ET_MASK) != SRMMU_ET_PTD; }



static inline int srmmu_pmd_present(pmd_t pmd)

{ return ((pmd_val(pmd) & SRMMU_ET_MASK) == SRMMU_ET_PTD); }



static inline pte_t srmmu_pte_wrprotect(pte_t pte)

{ return __pte(pte_val(pte) & ~SRMMU_WRITE);}
@@ -2078,9 +2072,6 @@ void __init ld_mmu_srmmu(void) 


	BTFIXUPSET_CALL(pte_present, srmmu_pte_present, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(pmd_bad, srmmu_pmd_bad, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(pmd_present, srmmu_pmd_present, BTFIXUPCALL_NORM);



	BTFIXUPSET_CALL(mk_pte, srmmu_mk_pte, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(mk_pte_phys, srmmu_mk_pte_phys, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(mk_pte_io, srmmu_mk_pte_io, BTFIXUPCALL_NORM);