Browse Source

[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>
Russell King 19 years ago
parent
commit
48fa14f761
1 changed files with 6 additions and 2 deletions
  1. 6 2
      arch/arm/mm/Kconfig

+ 6 - 2
arch/arm/mm/Kconfig

@@ -266,12 +266,18 @@ config CPU_32v6K
 # This defines the compiler instruction set which depends on the machine type.
 # This defines the compiler instruction set which depends on the machine type.
 config CPU_32v3
 config CPU_32v3
 	bool
 	bool
+	select TLS_REG_EMUL if SMP
+	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 
 config CPU_32v4
 config CPU_32v4
 	bool
 	bool
+	select TLS_REG_EMUL if SMP
+	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 
 config CPU_32v5
 config CPU_32v5
 	bool
 	bool
+	select TLS_REG_EMUL if SMP
+	select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
 
 
 config CPU_32v6
 config CPU_32v6
 	bool
 	bool
@@ -417,7 +423,6 @@ config CPU_BPREDICT_DISABLE
 
 
 config TLS_REG_EMUL
 config TLS_REG_EMUL
 	bool
 	bool
-	default y if SMP && (CPU_32v5 || CPU_32v4 || CPU_32v3)
 	help
 	help
 	  An SMP system using a pre-ARMv6 processor (there are apparently
 	  An SMP system using a pre-ARMv6 processor (there are apparently
 	  a few prototypes like that in existence) and therefore access to
 	  a few prototypes like that in existence) and therefore access to
@@ -436,7 +441,6 @@ config HAS_TLS_REG
 
 
 config NEEDS_SYSCALL_FOR_CMPXCHG
 config NEEDS_SYSCALL_FOR_CMPXCHG
 	bool
 	bool
-	default y if SMP && (CPU_32v5 || CPU_32v4 || CPU_32v3)
 	help
 	help
 	  SMP on a pre-ARMv6 processor?  Well OK then.
 	  SMP on a pre-ARMv6 processor?  Well OK then.
 	  Forget about fast user space cmpxchg support.
 	  Forget about fast user space cmpxchg support.