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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index de44c92..400b123 100644 (file)
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -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

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index cf1f2a4..7be323e 100644 (file)
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -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;
 

diff --git a/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h
index 95a0b58..a54f20d 100644 (file)
--- a/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h
@@ -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 */

diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
index e7c972f..79ab3ad 100644 (file)
--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
@@ -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

diff --git a/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
index f03c1c4..1022697 100644 (file)
--- a/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
@@ -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

diff --git a/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
index 6ea5908..c4579f1 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
@@ -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

diff --git a/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h
index e06f517..168359a 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h
@@ -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

diff --git a/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
index 9c06964..fdaf8c9 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h
@@ -44,7 +44,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() 16
 #define cpu_icache_line_size() 16

diff --git a/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
index 2e423fd..7a385fe 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h
@@ -44,7 +44,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

diff --git a/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
index 7cee0e2..0a61910 100644 (file)
--- a/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h
@@ -43,7 +43,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

diff --git a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
index bc46179..8539ccf 100644 (file)
--- a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
@@ -54,7 +54,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_has_inclusive_pcaches      0