diff --git a/[refs] b/[refs]
index 22b713710bc3..1acf70e2e4a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0762097625711e829a008b64f42dc0ec74abb284
+refs/heads/master: 367afaf83b0a8886ea566638a865701c54710af9
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index e7904bc92c73..cccacd9c95af 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -405,6 +405,7 @@ config CPU_32v5
 
 config CPU_32v6
 	bool
+	select TLS_REG_EMUL if !CPU_32v6K && !MMU
 
 config CPU_32v7
 	bool