path: root/arch/arm/mm/abort-ev6.S
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-31 17:02:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-31 17:02:57 -0700
commit94559a4a81a6912f6ca22988e544a43401947c68 (patch)
treeb3c798ddb053df5c687fec7500b4d9fb42137235 /arch/arm/mm/abort-ev6.S
parent19ed3eb975b7de9b4b0e41714eb9302cd95e7ae6 (diff)
parenteba1c71819d210f5e0d522571f9b8abce94fe9c5 (diff)
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "Various assorted fixes: - a couple of patches from Mark Rutland to resolve an errata with Cortex-A15 CPUs. - fix cpuidle for the CPU part ID changes in the last merge window - add support for a relocation which ARM binutils is generating in some circumstances" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex ARM: 8128/1: abort: don't clear the exclusive monitors ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations
Diffstat (limited to 'arch/arm/mm/abort-ev6.S')
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S
index 3815a8262af0..8c48c5c22a33 100644
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
@@ -17,12 +17,6 @@
.align 5
-#ifdef CONFIG_CPU_V6
- sub r1, sp, #4 @ Get unused stack location
- strex r0, r1, [r1] @ Clear the exclusive monitor
-#elif defined(CONFIG_CPU_32v6K)
- clrex
mrc p15, 0, r1, c5, c0, 0 @ get FSR
mrc p15, 0, r0, c6, c0, 0 @ get FAR