diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-16 09:52:33 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 17:03:26 -0500 |
commit | 48fa14f7618fe89cac9b807b05b66df4b595fc7e (patch) | |
tree | 66bd0889f1182c8716dd2613a1e23bed57374682 | |
parent | 74945c8616a50074277e18641baaae7464006766 (diff) |
[ARM] select TLS_REG_EMUL and NEEDS_SYSCALL_FOR_CMPXCHG
Rather than having a growing dependency line, use select to set
these configuration symbols.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mm/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 3b79d0e23455..57a48d92ac41 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -266,12 +266,18 @@ config CPU_32v6K | |||
266 | # This defines the compiler instruction set which depends on the machine type. | 266 | # This defines the compiler instruction set which depends on the machine type. |
267 | config CPU_32v3 | 267 | config CPU_32v3 |
268 | bool | 268 | bool |
269 | select TLS_REG_EMUL if SMP | ||
270 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
269 | 271 | ||
270 | config CPU_32v4 | 272 | config CPU_32v4 |
271 | bool | 273 | bool |
274 | select TLS_REG_EMUL if SMP | ||
275 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
272 | 276 | ||
273 | config CPU_32v5 | 277 | config CPU_32v5 |
274 | bool | 278 | bool |
279 | select TLS_REG_EMUL if SMP | ||
280 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
275 | 281 | ||
276 | config CPU_32v6 | 282 | config CPU_32v6 |
277 | bool | 283 | bool |
@@ -417,7 +423,6 @@ config CPU_BPREDICT_DISABLE | |||
417 | 423 | ||
418 | config TLS_REG_EMUL | 424 | config TLS_REG_EMUL |
419 | bool | 425 | bool |
420 | default y if SMP && (CPU_32v5 || CPU_32v4 || CPU_32v3) | ||
421 | help | 426 | help |
422 | An SMP system using a pre-ARMv6 processor (there are apparently | 427 | An SMP system using a pre-ARMv6 processor (there are apparently |
423 | a few prototypes like that in existence) and therefore access to | 428 | a few prototypes like that in existence) and therefore access to |
@@ -436,7 +441,6 @@ config HAS_TLS_REG | |||
436 | 441 | ||
437 | config NEEDS_SYSCALL_FOR_CMPXCHG | 442 | config NEEDS_SYSCALL_FOR_CMPXCHG |
438 | bool | 443 | bool |
439 | default y if SMP && (CPU_32v5 || CPU_32v4 || CPU_32v3) | ||
440 | help | 444 | help |
441 | SMP on a pre-ARMv6 processor? Well OK then. | 445 | SMP on a pre-ARMv6 processor? Well OK then. |
442 | Forget about fast user space cmpxchg support. | 446 | Forget about fast user space cmpxchg support. |