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

Commit ccedb20c authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Simplify phys_addr_mask()/PTE_PHYS_MASK for 29/32-bit. 



Given that __in_29bit_mode() is a constant for the non-PMB case, we can
simply use the PMB-facing version of phys_addr_mask() and drop the other
variants.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7fe19da4

arch/sh/include/asm/pgtable.h

+0 −12
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static inline unsigned long long neff_sign_extend(unsigned long val) 
#define PHYS_ADDR_MASK29		0x1fffffff

#define PHYS_ADDR_MASK32		0xffffffff



#ifdef CONFIG_PMB

static inline unsigned long phys_addr_mask(void)

{

	/* Is the MMU in 29bit mode? */
@@ -75,17 +74,6 @@ static inline unsigned long phys_addr_mask(void) 


	return PHYS_ADDR_MASK32;

}

#elif defined(CONFIG_32BIT)

static inline unsigned long phys_addr_mask(void)

{

	return PHYS_ADDR_MASK32;

}

#else

static inline unsigned long phys_addr_mask(void)

{

	return PHYS_ADDR_MASK29;

}

#endif



#define PTE_PHYS_MASK		(phys_addr_mask() & PAGE_MASK)

#define PTE_FLAGS_MASK		(~(PTE_PHYS_MASK) << PAGE_SHIFT)