Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c348eaee7ee29df402ce9103a94174cbb1883213..ae69809a9e479bef7617e41627b082452c93d09e 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -669,7 +669,7 @@ config ARM_VIRT_EXT
          details.
 
 config SWP_EMULATE
-       bool "Emulate SWP/SWPB instructions"
+       bool "Emulate SWP/SWPB instructions" if !SMP
        depends on CPU_V7
        default y if SMP
        select HAVE_PROC_CPU if PROC_FS
@@ -854,7 +854,7 @@ config OUTER_CACHE_SYNC
 
 config CACHE_FEROCEON_L2
        bool "Enable the Feroceon L2 cache controller"
-       depends on ARCH_KIRKWOOD || ARCH_MV78XX0 || ARCH_MVEBU
+       depends on ARCH_MV78XX0 || ARCH_MVEBU
        default y
        select OUTER_CACHE
        help
@@ -907,8 +907,8 @@ config PL310_ERRATA_588369
           They are architecturally defined to behave as the execution of a
           clean operation followed immediately by an invalidate operation,
           both performing to the same memory location. This functionality
-          is not correctly implemented in PL310 as clean lines are not
-          invalidated as a result of these operations.
+          is not correctly implemented in PL310 prior to r2p0 (fixed in r2p0)
+          as clean lines are not invalidated as a result of these operations.
 
 config PL310_ERRATA_727915
        bool "PL310 errata: Background Clean & Invalidate by Way operation can cause data corruption"
@@ -918,7 +918,8 @@ config PL310_ERRATA_727915
          PL310 can handle normal accesses while it is in progress. Under very
          rare circumstances, due to this erratum, write data can be lost when
          PL310 treats a cacheable write transaction during a Clean &
-         Invalidate by Way operation.
+         Invalidate by Way operation.  Revisions prior to r3p1 are affected by
+         this errata (fixed in r3p1).
 
 config PL310_ERRATA_753970
        bool "PL310 errata: cache sync operation may be faulty"