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

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

sparc32: Un-btfixup pte_{write,dirty,young}i 



And we can certainly get rid of the const function attributes, there
is no way that's needed any longer and no other arch uses this kind
of annotation here.

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

arch/sparc/include/asm/pgtable_32.h

+3 −10
Original line number Diff line number Diff line
@@ -207,26 +207,19 @@ static inline void pgd_clear(pgd_t *pgdp) 
 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

BTFIXUPDEF_HALF(pte_writei)

BTFIXUPDEF_HALF(pte_dirtyi)

BTFIXUPDEF_HALF(pte_youngi)



static int pte_write(pte_t pte) __attribute_const__;

static inline int pte_write(pte_t pte)

{

	return pte_val(pte) & BTFIXUP_HALF(pte_writei);

	return pte_val(pte) & SRMMU_WRITE;

}



static int pte_dirty(pte_t pte) __attribute_const__;

static inline int pte_dirty(pte_t pte)

{

	return pte_val(pte) & BTFIXUP_HALF(pte_dirtyi);

	return pte_val(pte) & SRMMU_DIRTY;

}



static int pte_young(pte_t pte) __attribute_const__;

static inline int pte_young(pte_t pte)

{

	return pte_val(pte) & BTFIXUP_HALF(pte_youngi);

	return pte_val(pte) & SRMMU_REF;

}



/*

arch/sparc/mm/srmmu.c

+0 −3
Original line number Diff line number Diff line
@@ -2073,9 +2073,6 @@ void __init load_mmu(void) 
	BTFIXUPSET_CALL(free_pgd_fast, srmmu_free_pgd_fast, BTFIXUPCALL_NORM);

	BTFIXUPSET_CALL(get_pgd_fast, srmmu_get_pgd_fast, BTFIXUPCALL_NORM);



	BTFIXUPSET_HALF(pte_writei, SRMMU_WRITE);

	BTFIXUPSET_HALF(pte_dirtyi, SRMMU_DIRTY);

	BTFIXUPSET_HALF(pte_youngi, SRMMU_REF);

	BTFIXUPSET_HALF(pte_filei, SRMMU_FILE);

	BTFIXUPSET_HALF(pte_wrprotecti, SRMMU_WRITE);

	BTFIXUPSET_HALF(pte_mkcleani, SRMMU_DIRTY);