|
|
@@ -1205,10 +1205,11 @@ config SMP
|
|
|
depends on EXPERIMENTAL
|
|
|
depends on GENERIC_CLOCKEVENTS
|
|
|
depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
|
|
|
- MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
|
|
|
- ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
|
|
|
+ MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
|
|
|
+ ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
|
|
|
+ ARCH_MSM_SCORPIONMP
|
|
|
select USE_GENERIC_SMP_HELPERS
|
|
|
- select HAVE_ARM_SCU
|
|
|
+ select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
|
|
|
help
|
|
|
This enables support for systems with more than one CPU. If you have
|
|
|
a system with only one CPU, like most personal computers, say N. If
|
|
|
@@ -1283,6 +1284,7 @@ config NR_CPUS
|
|
|
config HOTPLUG_CPU
|
|
|
bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
|
|
|
depends on SMP && HOTPLUG && EXPERIMENTAL
|
|
|
+ depends on !ARCH_MSM
|
|
|
help
|
|
|
Say Y here to experiment with turning CPUs off and on. CPUs
|
|
|
can be controlled through /sys/devices/system/cpu.
|
|
|
@@ -1291,7 +1293,7 @@ config LOCAL_TIMERS
|
|
|
bool "Use local timer interrupts"
|
|
|
depends on SMP
|
|
|
default y
|
|
|
- select HAVE_ARM_TWD
|
|
|
+ select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP
|
|
|
help
|
|
|
Enable support for local timers on SMP platforms, rather then the
|
|
|
legacy IPI broadcast method. Local timers allows the system
|
Russell King