[ARM] Remove partial non-v6 binutils compatibility

proc-v6 contains some compatibility to be able to use the V6
"cps" instruction.  However, the kernel makes use of this
instruction elsewhere extensively, so there's no point keeping
this compatibility anymore.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index ee6f152987350033fdf69586b8fe01314f5c28eb..09b1a41a6de887f0afd3ebf8e9dbf520b51018c4 100644 (file)
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -29,38 +29,6 @@
 #define TTB_RGN_WT     (2 << 3)
 #define TTB_RGN_WB     (3 << 3)
 
-       .macro  cpsie, flags
-       .ifc \flags, f
-       .long   0xf1080040
-       .exitm
-       .endif
-       .ifc \flags, i
-       .long   0xf1080080
-       .exitm
-       .endif
-       .ifc \flags, if
-       .long   0xf10800c0
-       .exitm
-       .endif
-       .err
-       .endm
-
-       .macro  cpsid, flags
-       .ifc \flags, f
-       .long   0xf10c0040
-       .exitm
-       .endif
-       .ifc \flags, i
-       .long   0xf10c0080
-       .exitm
-       .endif
-       .ifc \flags, if
-       .long   0xf10c00c0
-       .exitm
-       .endif
-       .err
-       .endm
-
 ENTRY(cpu_v6_proc_init)
        mov     pc, lr