Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renes...

[firefly-linux-kernel-4.4.55.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf006d40342ca4d51a0128ca0ae60dc36452cd6f..b3727c29d7107ac3e7e68e2579eb214751b41ba5 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -340,8 +340,8 @@ config ARCH_AT91
        select IRQ_DOMAIN
        select NEED_MACH_IO_H if PCCARD
        help
-         This enables support for systems based on the Atmel AT91RM9200,
-         AT91SAM9 processors.
+         This enables support for systems based on Atmel
+         AT91RM9200 and AT91SAM9* processors.
 
 config ARCH_BCMRING
        bool "Broadcom BCMRING"
@@ -1186,6 +1186,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