diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-17 10:53:56 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-02 16:23:30 -0500 |
commit | 8762df4d5c5462bea8ad0f76473f39e9ce9b8662 (patch) | |
tree | 3c9d2d8727cf8e378fbc7288ba80496fbd8cee20 /arch/arm/mm/Kconfig | |
parent | 37bc618fe2689a7f8de8fac82e72b00ecea4d43d (diff) |
ARM: v6k: use CPU domain feature if we include support for arch < ARMv6K
Rather than turning off CPU domain switching when the build architecture
includes ARMv6K, thereby causing problems for ARMv6-supporting kernels,
turn it on when it's required to support a CPU architecture.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 22a3f4ad6ae5..29215f5f11b2 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -435,25 +435,30 @@ config CPU_32v3 | |||
435 | bool | 435 | bool |
436 | select TLS_REG_EMUL if SMP || !MMU | 436 | select TLS_REG_EMUL if SMP || !MMU |
437 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 437 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
438 | select CPU_USE_DOMAINS if MMU | ||
438 | 439 | ||
439 | config CPU_32v4 | 440 | config CPU_32v4 |
440 | bool | 441 | bool |
441 | select TLS_REG_EMUL if SMP || !MMU | 442 | select TLS_REG_EMUL if SMP || !MMU |
442 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 443 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
444 | select CPU_USE_DOMAINS if MMU | ||
443 | 445 | ||
444 | config CPU_32v4T | 446 | config CPU_32v4T |
445 | bool | 447 | bool |
446 | select TLS_REG_EMUL if SMP || !MMU | 448 | select TLS_REG_EMUL if SMP || !MMU |
447 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 449 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
450 | select CPU_USE_DOMAINS if MMU | ||
448 | 451 | ||
449 | config CPU_32v5 | 452 | config CPU_32v5 |
450 | bool | 453 | bool |
451 | select TLS_REG_EMUL if SMP || !MMU | 454 | select TLS_REG_EMUL if SMP || !MMU |
452 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | 455 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP |
456 | select CPU_USE_DOMAINS if MMU | ||
453 | 457 | ||
454 | config CPU_32v6 | 458 | config CPU_32v6 |
455 | bool | 459 | bool |
456 | select TLS_REG_EMUL if !CPU_32v6K && !MMU | 460 | select TLS_REG_EMUL if !CPU_32v6K && !MMU |
461 | select CPU_USE_DOMAINS if CPU_V6 && MMU | ||
457 | 462 | ||
458 | config CPU_32v6K | 463 | config CPU_32v6K |
459 | bool "Support ARM V6K processor extensions" if !SMP | 464 | bool "Support ARM V6K processor extensions" if !SMP |
@@ -620,8 +625,6 @@ config CPU_CP15_MPU | |||
620 | 625 | ||
621 | config CPU_USE_DOMAINS | 626 | config CPU_USE_DOMAINS |
622 | bool | 627 | bool |
623 | depends on MMU | ||
624 | default y if !CPU_32v6K | ||
625 | help | 628 | help |
626 | This option enables or disables the use of domain switching | 629 | This option enables or disables the use of domain switching |
627 | via the set_fs() function. | 630 | via the set_fs() function. |