diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2011-01-07 04:57:53 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-07 04:57:53 +0100 |
commit | e118a1df32c41186f717bbe6b42142741530e8b9 (patch) | |
tree | 0fab9974fe5102ed872a1b40016e7394e47a490a /arch/arm/mm | |
parent | Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-e118a1df32c41186f717bbe6b42142741530e8b9.tar.xz linux-e118a1df32c41186f717bbe6b42142741530e8b9.zip |
ARM: Do not enable SWP emulation if CPU_V6 && CPU_V7
This option uses LDREXB/STREXB to emulate SWPB but these instructions
are not supported on all the ARMv6 processors.
Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Leif Lindholm <Leif.Lindholm@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 49db8b3e4a49..0fe2389febf3 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -644,7 +644,7 @@ config ARM_THUMBEE config SWP_EMULATE bool "Emulate SWP/SWPB instructions" - depends on CPU_V7 + depends on CPU_V7 && !CPU_V6 select HAVE_PROC_CPU if PROC_FS default y if SMP help |