Merge branch 'swp' (early part) into for-next

This commit is contained in:
Russell King
2014-08-05 10:27:17 +01:00
3 changed files with 27 additions and 8 deletions

View File

@ -669,7 +669,7 @@ config ARM_VIRT_EXT
details.
config SWP_EMULATE
bool "Emulate SWP/SWPB instructions"
bool "Emulate SWP/SWPB instructions" if !SMP
depends on CPU_V7
default y if SMP
select HAVE_PROC_CPU if PROC_FS