diff --git a/[refs] b/[refs] index bf81b8aff7d8..70a43ccef21d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a493820df65909d344824499937c939150559ace +refs/heads/master: 48af7215405215e81e72aba1ae8031ca2fea840c diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig index 007766a0644c..27892e34b060 100644 --- a/trunk/arch/arm/mm/Kconfig +++ b/trunk/arch/arm/mm/Kconfig @@ -413,6 +413,7 @@ config CPU_BPREDICT_DISABLE config HAS_TLS_REG bool depends on CPU_32v6 && !CPU_32v5 && !CPU_32v4 && !CPU_32v3 + default y help This selects support for the CP15 thread register. It is defined to be available on ARMv6 or later. However