diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:26 -0400 |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/include/asm/tls.h | |
| parent | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff) | |
| parent | 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff) | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/tls.h')
| -rw-r--r-- | arch/arm/include/asm/tls.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h index e71d6ff8d104..60843eb0f61c 100644 --- a/arch/arm/include/asm/tls.h +++ b/arch/arm/include/asm/tls.h | |||
| @@ -28,15 +28,14 @@ | |||
| 28 | #define tls_emu 1 | 28 | #define tls_emu 1 |
| 29 | #define has_tls_reg 1 | 29 | #define has_tls_reg 1 |
| 30 | #define set_tls set_tls_none | 30 | #define set_tls set_tls_none |
| 31 | #elif __LINUX_ARM_ARCH__ >= 7 || \ | 31 | #elif defined(CONFIG_CPU_V6) |
| 32 | (__LINUX_ARM_ARCH__ == 6 && defined(CONFIG_CPU_32v6K)) | ||
| 33 | #define tls_emu 0 | ||
| 34 | #define has_tls_reg 1 | ||
| 35 | #define set_tls set_tls_v6k | ||
| 36 | #elif __LINUX_ARM_ARCH__ == 6 | ||
| 37 | #define tls_emu 0 | 32 | #define tls_emu 0 |
| 38 | #define has_tls_reg (elf_hwcap & HWCAP_TLS) | 33 | #define has_tls_reg (elf_hwcap & HWCAP_TLS) |
| 39 | #define set_tls set_tls_v6 | 34 | #define set_tls set_tls_v6 |
| 35 | #elif defined(CONFIG_CPU_32v6K) | ||
| 36 | #define tls_emu 0 | ||
| 37 | #define has_tls_reg 1 | ||
| 38 | #define set_tls set_tls_v6k | ||
| 40 | #else | 39 | #else |
| 41 | #define tls_emu 0 | 40 | #define tls_emu 0 |
| 42 | #define has_tls_reg 0 | 41 | #define has_tls_reg 0 |