[PATCH] ARM: remove unnecessary __LINUX_ARM_ARCH__ check in <asm/cp15.h>

[Ethan Nelson-Moore]

__LINUX_ARM_ARCH__ is only defined to 3 on the Risc PC. This is because
its currently supported configuration uses a StrongARM ARMv4 CPU, but
its bus does not support half-word accesses, so LDRH/STRH instructions
are disabled for it. Otherwise, it is a standard ARMv4 platform.
Support for actual ARMv3 CPUs was dropped in commit 357c9c1f07d4 ("ARM:
Remove support for ARMv3 ARM610 and ARM710 CPUs"), and therefore the
check for __LINUX_ARM_ARCH__ in <asm/cp15.h> is unnecessary. Remove it.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore at gmail.com>
---
 arch/arm/include/asm/cp15.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h
index a54230e65647..0d9f40b346e9 100644
--- a/arch/arm/include/asm/cp15.h
+++ b/arch/arm/include/asm/cp15.h
@@ -42,11 +42,7 @@
 
 #ifndef __ASSEMBLY__
 
-#if __LINUX_ARM_ARCH__ >= 4
 #define vectors_high()	(get_cr() & CR_V)
-#else
-#define vectors_high()	(0)
-#endif
 
 #ifdef CONFIG_CPU_CP15
 
-- 
2.43.0