From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 20 Jul 2007 10:42:51 +0000 (+0100)
Subject: [ARM] 4501/1: nommu: Select TLS register emulation if ARMv6 and not v6K
X-Git-Tag: v2.6.23-rc1~8^2^6~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=367afaf83b0a8886ea566638a865701c54710af9;p=linux-2.6

[ARM] 4501/1: nommu: Select TLS register emulation if ARMv6 and not v6K

If not MMU and not v6K, access to the TLS register has to be
emulated. MMU-less systems do not provide a high page for kuser
helpers.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index e7904bc92c..cccacd9c95 100644
--- a/arch/arm/mm/Kconfig
+++ b/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