Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 612275ad authored by Russell King's avatar Russell King
Browse files

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

parents 698fd6a2 176bfc44

arch/arm/Kconfig

+6 −4
Original line number Original line Diff line number Diff line
@@ -1206,9 +1206,10 @@ config SMP 
	depends on GENERIC_CLOCKEVENTS

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP

	select USE_GENERIC_SMP_HELPERS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	help

	help

	  This enables support for systems with more than one CPU. If you have

	  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

	  a system with only one CPU, like most personal computers, say N. If
@@ -1283,6 +1284,7 @@ config NR_CPUS 
config HOTPLUG_CPU

config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"

	depends on SMP && HOTPLUG && EXPERIMENTAL

	depends on SMP && HOTPLUG && EXPERIMENTAL

	depends on !ARCH_MSM

	help

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu.

	  can be controlled through /sys/devices/system/cpu.
@@ -1291,7 +1293,7 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	bool "Use local timer interrupts"

	depends on SMP

	depends on SMP

	default y

	default y

	select HAVE_ARM_TWD

	select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP

	help

	help

	  Enable support for local timers on SMP platforms, rather then the

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

	  legacy IPI broadcast method.  Local timers allows the system

arch/arm/mach-msm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,8 @@ endchoice 




config MSM_SOC_REV_A

config MSM_SOC_REV_A

	bool

	bool

config  ARCH_MSM_SCORPIONMP

	bool





config  ARCH_MSM_ARM11

config  ARCH_MSM_ARM11

	bool

	bool