summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-09 02:31:01 -0700
committerOlof Johansson <olof@lixom.net>2012-05-09 02:31:01 -0700
commitd5a2a1ba838f60d92bf67c5eef533e95453752cb (patch)
treef6436b5e2b430197f37e49ffff23e91ef694b303 /arch/arm/Kconfig
parente1851240a891a305946814587497f121b900b4be (diff)
parentd48b97b403d23f6df0b990cee652bdf9a52337a3 (diff)
Merge tag 'v3.4-rc6' into next/cleanup
Linux 3.4-rc6 Resolve conflict where an u5500 file had a bugfix go in, but was deleted in the branch staged for next merge window. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a231594ba44e..cece19202c6b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1160,6 +1160,15 @@ if !MMU
source "arch/arm/Kconfig-nommu"
endif
+config ARM_ERRATA_326103
+ bool "ARM errata: FSR write bit incorrect on a SWP to read-only memory"
+ depends on CPU_V6
+ help
+ Executing a SWP instruction to read-only memory does not set bit 11
+ of the FSR on the ARM 1136 prior to r1p0. This causes the kernel to
+ treat the access as a read, preventing a COW from occurring and
+ causing the faulting task to livelock.
+
config ARM_ERRATA_411920
bool "ARM errata: Invalidation of the Instruction Cache operation can fail"
depends on CPU_V6 || CPU_V6K