From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 11 Jun 2009 14:35:00 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
X-Git-Tag: MMI-PSA29.97-13-9~27927^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=42578c82e0f1810a07ebe29cb05e874893243d8c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-realview/Makefile
	arch/arm/mach-realview/platsmp.c
---

42578c82e0f1810a07ebe29cb05e874893243d8c
diff --cc arch/arm/Kconfig
index 430d2b756165,ceb549ca9635..c857111ab964
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -849,10 -859,8 +849,11 @@@ source "kernel/time/Kconfig
  
  config SMP
  	bool "Symmetric Multi-Processing (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP ||ARCH_OMAP4)
 -	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX)
++	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
++		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
 +	depends on GENERIC_CLOCKEVENTS
  	select USE_GENERIC_SMP_HELPERS
 +	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4)
  	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
@@@ -920,9 -916,8 +921,10 @@@ config HOTPLUG_CP
  
  config LOCAL_TIMERS
  	bool "Use local timer interrupts"
- 	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || ARCH_OMAP4)
 -	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || MACH_REALVIEW_PBX)
++	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
++		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4)
  	default y
 +	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4)
  	help
  	  Enable support for local timers on SMP platforms, rather then the
  	  legacy IPI broadcast method.  Local timers allows the system
diff --cc arch/arm/kernel/smp.c
index 0d8097fa4ca5,ece658e773a6..de885fd256c5
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -28,6 -26,6 +28,7 @@@
  #include <asm/atomic.h>
  #include <asm/cacheflush.h>
  #include <asm/cpu.h>
++#include <asm/cputype.h>
  #include <asm/mmu_context.h>
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>
diff --cc arch/arm/mach-realview/Makefile
index e13d0947ad0b,7df1931ff443..e704edb733c0
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@@ -7,6 -7,6 +7,7 @@@ obj-$(CONFIG_MACH_REALVIEW_EB)		+= real
  obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o
  obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o
  obj-$(CONFIG_MACH_REALVIEW_PBA8)	+= realview_pba8.o
+ obj-$(CONFIG_MACH_REALVIEW_PBX)		+= realview_pbx.o
 -obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o localtimer.o
 +obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 +obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o
diff --cc arch/arm/mach-realview/platsmp.c
index ca742172ea78,e3bd9345c6a1..ac0e83f1cc3a
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@@ -23,7 -22,8 +23,8 @@@
  
  #include <mach/board-eb.h>
  #include <mach/board-pb11mp.h>
+ #include <mach/board-pbx.h>
 -#include <mach/scu.h>
 +#include <asm/smp_scu.h>
  
  #include "core.h"