Commit b604d497 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Thomas Bogendoerfer
Browse files

MIPS: remove cpu_has_64bit_addresses 



This macro is identical to CONFIG_64BIT, and using a Kconfig variable
for the only places that checks them (the ioremap implementation) will
simplify later patches in this series.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent acfaaf52

arch/mips/include/asm/cpu-features.h

+0 −6
Original line number Diff line number Diff line
@@ -435,9 +435,6 @@ 
# ifndef cpu_has_64bit_gp_regs

# define cpu_has_64bit_gp_regs		0

# endif

# ifndef cpu_has_64bit_addresses

# define cpu_has_64bit_addresses	0

# endif

# ifndef cpu_vmbits

# define cpu_vmbits 31

# endif
@@ -456,9 +453,6 @@ 
# ifndef cpu_has_64bit_gp_regs

# define cpu_has_64bit_gp_regs		1

# endif

# ifndef cpu_has_64bit_addresses

# define cpu_has_64bit_addresses	1

# endif

# ifndef cpu_vmbits

# define cpu_vmbits cpu_data[0].vmbits

# define __NEED_VMBITS_PROBE

arch/mips/include/asm/io.h

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si 


#define __IS_LOW512(addr) (!((phys_addr_t)(addr) & (phys_addr_t) ~0x1fffffffULL))



	if (cpu_has_64bit_addresses) {

	if (IS_ENABLED(CONFIG_64BIT)) {

		u64 base = UNCAC_BASE;



		/*
@@ -275,7 +275,7 @@ static inline void iounmap(const volatile void __iomem *addr) 


#define __IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1)



	if (cpu_has_64bit_addresses ||

	if (IS_ENABLED(CONFIG_64BIT) ||

	    (__builtin_constant_p(addr) && __IS_KSEG1(addr)))

		return;

arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h

+0 −1
Original line number Diff line number Diff line
@@ -56,6 +56,5 @@ 
#define cpu_has_64bits			0

#define cpu_has_64bit_zero_reg		0

#define cpu_has_64bit_gp_regs		0

#define cpu_has_64bit_addresses		0



#endif /* __ASM_MACH_ATH25_CPU_FEATURE_OVERRIDES_H */

arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#define cpu_has_64bits		0

#define cpu_has_64bit_zero_reg	0

#define cpu_has_64bit_gp_regs	0

#define cpu_has_64bit_addresses 0



#define cpu_dcache_line_size()	32

#define cpu_icache_line_size()	32

arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#define cpu_has_64bits		0

#define cpu_has_64bit_zero_reg	0

#define cpu_has_64bit_gp_regs	0

#define cpu_has_64bit_addresses	0



#define cpu_dcache_line_size()	32

#define cpu_icache_line_size()	32

CRA Git | Maintained and supported by SUSTech CRA and CCSE