On Mon, 17 Jan 2011, Russell King - ARM Linux wrote:

> 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.
> 
> Signed-off-by: Russell King <[email protected]>

Acked-by: Nicolas Pitre <[email protected]>


> ---
>  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 22a3f4a..29215f5 100644
> --- a/arch/arm/mm/Kconfig
> +++ b/arch/arm/mm/Kconfig
> @@ -435,25 +435,30 @@ config CPU_32v3
>       bool
>       select TLS_REG_EMUL if SMP || !MMU
>       select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
> +     select CPU_USE_DOMAINS if MMU
>  
>  config CPU_32v4
>       bool
>       select TLS_REG_EMUL if SMP || !MMU
>       select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
> +     select CPU_USE_DOMAINS if MMU
>  
>  config CPU_32v4T
>       bool
>       select TLS_REG_EMUL if SMP || !MMU
>       select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
> +     select CPU_USE_DOMAINS if MMU
>  
>  config CPU_32v5
>       bool
>       select TLS_REG_EMUL if SMP || !MMU
>       select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
> +     select CPU_USE_DOMAINS if MMU
>  
>  config CPU_32v6
>       bool
>       select TLS_REG_EMUL if !CPU_32v6K && !MMU
> +     select CPU_USE_DOMAINS if CPU_V6 && MMU
>  
>  config CPU_32v6K
>       bool "Support ARM V6K processor extensions" if !SMP
> @@ -620,8 +625,6 @@ config CPU_CP15_MPU
>  
>  config CPU_USE_DOMAINS
>       bool
> -     depends on MMU
> -     default y if !CPU_32v6K
>       help
>         This option enables or disables the use of domain switching
>         via the set_fs() function.
> -- 
> 1.6.2.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to