1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 5b670c9ac5ef..c4fc6be629de 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -409,3 +409,24 @@ config CPU_BPREDICT_DISABLE
         depends on CPU_ARM1020
         help
           Say Y here to disable branch prediction.  If unsure, say N.
+
+config TLS_REG_EMUL
+        bool
+        default y if (SMP || CPU_32v6) && (CPU_32v5 || CPU_32v4 || CPU_32v3)
+        help
+          We might be running on an ARMv6+ processor which should have the TLS
+          register but for some reason we can't use it, or maybe an SMP system
+          using a pre-ARMv6 processor (there are apparently a few prototypes
+          like that in existence) and therefore access to that register must
+          be emulated.
+
+config HAS_TLS_REG
+        bool
+        depends on CPU_32v6
+        default y if !TLS_REG_EMUL
+        help
+          This selects support for the CP15 thread register.
+          It is defined to be available on ARMv6 or later.  If a particular
+          ARMv6 or later CPU doesn't support it then it must omc;ide "select
+          TLS_REG_EMUL" along with its other caracteristics.
+