projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mm
/
Kconfig
diff --git
a/arch/arm/mm/Kconfig
b/arch/arm/mm/Kconfig
index
1f8fed9
..
e9c290c
100644
(file)
--- a/
arch/arm/mm/Kconfig
+++ b/
arch/arm/mm/Kconfig
@@
-446,7
+446,6
@@
config CPU_32v5
config CPU_32v6
bool
config CPU_32v6
bool
- select CPU_USE_DOMAINS if CPU_V6 && MMU
select TLS_REG_EMUL if !CPU_32v6K && !MMU
config CPU_32v6K
select TLS_REG_EMUL if !CPU_32v6K && !MMU
config CPU_32v6K
@@
-671,7
+670,7
@@
config ARM_VIRT_EXT
config SWP_EMULATE
bool "Emulate SWP/SWPB instructions"
config SWP_EMULATE
bool "Emulate SWP/SWPB instructions"
- depends on
!CPU_USE_DOMAINS &&
CPU_V7
+ depends on CPU_V7
default y if SMP
select HAVE_PROC_CPU if PROC_FS
help
default y if SMP
select HAVE_PROC_CPU if PROC_FS
help
@@
-799,6
+798,7
@@
config NEED_KUSER_HELPERS
config KUSER_HELPERS
bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
config KUSER_HELPERS
bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
+ depends on MMU
default y
help
Warning: disabling this option may break user programs.
default y
help
Warning: disabling this option may break user programs.