diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-17 17:27:48 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-02 21:23:31 +0000 |
| commit | 581388c15bd61a2548af0b87152648741d038571 (patch) | |
| tree | f57535814ca07af18811cf5355b51e6cbcd69f98 /arch/arm/mm | |
| parent | 60799c6dd727b72b9c6794e9d1ab2d2b01a87ca4 (diff) | |
| download | kernel_samsung_smdk4412-581388c15bd61a2548af0b87152648741d038571.zip kernel_samsung_smdk4412-581388c15bd61a2548af0b87152648741d038571.tar.gz kernel_samsung_smdk4412-581388c15bd61a2548af0b87152648741d038571.tar.bz2 | |
ARM: v6k: allow swp emulation again when ARMv7 is enabled
Now that we build a v6+v6k+v7 kernel with -march=armv6k for everything,
we don't need to disable swp emulation to work around the build problem
with OMAP.
Tested-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')
| -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 ca1238b..843bc8c 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -652,7 +652,7 @@ config ARM_THUMBEE config SWP_EMULATE bool "Emulate SWP/SWPB instructions" - depends on CPU_V7 && !CPU_V6 + depends on CPU_V7 select HAVE_PROC_CPU if PROC_FS default y if SMP help |