Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable

2 files changed, 8 insertions, 4 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db524e75c4a2..c8fa1443e2c1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index dbbcfeb919db..31e5fd63ec9a 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -49,6 +49,8 @@ endchoice
 
 config MSM_SOC_REV_A
         bool
+config  ARCH_MSM_SCORPIONMP
+        bool
 
 config  ARCH_MSM_ARM11
         bool