Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37bc618f authored by Russell King's avatar Russell King
Browse files

ARM: v6k: select TLS register code according to V6 variants 



If CONFIG_CPU_V6 is enabled, we may or may not have the TLS register.
Use the conditional code which copes with this variability.  Otherwise,
if CONFIG_CPU_32v6K is set, we know we have the TLS register on all
supported CPUs, so use it unconditionally.

Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a41297a0

arch/arm/include/asm/tls.h

+5 −6
Original line number Diff line number Diff line
@@ -28,15 +28,14 @@ 
#define tls_emu		1

#define has_tls_reg		1

#define set_tls		set_tls_none

#elif __LINUX_ARM_ARCH__ >= 7 ||					\

	(__LINUX_ARM_ARCH__ == 6 && defined(CONFIG_CPU_32v6K))

#define tls_emu		0

#define has_tls_reg		1

#define set_tls		set_tls_v6k

#elif __LINUX_ARM_ARCH__ == 6

#elif defined(CONFIG_CPU_V6)

#define tls_emu		0

#define has_tls_reg		(elf_hwcap & HWCAP_TLS)

#define set_tls		set_tls_v6

#elif defined(CONFIG_CPU_32v6K)

#define tls_emu		0

#define has_tls_reg		1

#define set_tls		set_tls_v6k

#else

#define tls_emu		0

#define has_tls_reg		0