From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jul 2011 05:59:39 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.1-rc1~236
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=184475029a724b6b900d88fc3a5f462a6107d5af

Merge branch 'next' of git://git./linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
  drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
  powerpc/85xx: fix mpic configuration in CAMP mode
  powerpc: Copy back TIF flags on return from softirq stack
  powerpc/64: Make server perfmon only built on ppc64 server devices
  powerpc/pseries: Fix hvc_vio.c build due to recent changes
  powerpc: Exporting boot_cpuid_phys
  powerpc: Add CFAR to oops output
  hvc_console: Add kdb support
  powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
  powerpc/irq: Quieten irq mapping printks
  powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
  powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
  powerpc: Disable IRQs off tracer in ppc64 defconfig
  powerpc: Sync pseries and ppc64 defconfigs
  powerpc/pseries/hvconsole: Fix dropped console output
  hvc_console: Improve tty/console put_chars handling
  powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
  powerpc/mm: Fix output of total_ram.
  powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
  powerpc: Correct annotations of pmu registration functions
  ...

Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
drivers/cpufreq
---

184475029a724b6b900d88fc3a5f462a6107d5af
diff --cc arch/powerpc/Kconfig
index cdf7a0a64406,f8e578be5806..374c475e56a3
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -134,7 -134,7 +134,8 @@@ config PP
  	select GENERIC_IRQ_SHOW_LEVEL
  	select HAVE_RCU_TABLE_FREE if SMP
  	select HAVE_SYSCALL_TRACEPOINTS
 +	select HAVE_BPF_JIT if (PPC64 && NET)
+ 	select HAVE_ARCH_JUMP_LABEL
  
  config EARLY_PRINTK
  	bool
diff --cc arch/powerpc/kernel/smp.c
index 09a85a9045d6,567a1746ed74..f932f8a0cf0c
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -241,9 -243,8 +243,9 @@@ static inline void do_message_pass(int 
  void smp_send_reschedule(int cpu)
  {
  	if (likely(smp_ops))
- 		smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
+ 		do_message_pass(cpu, PPC_MSG_RESCHEDULE);
  }
 +EXPORT_SYMBOL_GPL(smp_send_reschedule);
  
  void arch_send_call_function_single_ipi(int cpu)
  {
diff --cc drivers/Kconfig
index 9e7a4f5b5c2e,3c1d4a59a864..95b9e7eefadc
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -126,6 -126,6 +126,8 @@@ source "drivers/hwspinlock/Kconfig
  
  source "drivers/clocksource/Kconfig"
  
 +source "drivers/iommu/Kconfig"
 +
+ source "drivers/virt/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index 939fcdeb2d31,cd546ebab9a7..7fa433a7030c
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -122,5 -122,6 +122,8 @@@ obj-y				+= ieee802154
  obj-y				+= clk/
  
  obj-$(CONFIG_HWSPINLOCK)	+= hwspinlock/
 +obj-$(CONFIG_NFC)		+= nfc/
 +obj-$(CONFIG_IOMMU_SUPPORT)	+= iommu/
+ 
+ # Virtualization drivers
+ obj-$(CONFIG_VIRT_DRIVERS)	+= virt/
diff --cc drivers/cpufreq/Kconfig
index e898215b88af,61ae639de9d4..e24a2a1b6666
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@@ -184,10 -184,10 +184,15 @@@ depends on X8
  source "drivers/cpufreq/Kconfig.x86"
  endmenu
  
 +menu "ARM CPU frequency scaling drivers"
 +depends on ARM
 +source "drivers/cpufreq/Kconfig.arm"
 +endmenu
 +
+ menu "PowerPC CPU frequency scaling drivers"
+ depends on PPC32 || PPC64
+ source "drivers/cpufreq/Kconfig.powerpc"
+ endmenu
+ 
  endif
  endmenu
diff --cc drivers/cpufreq/Makefile
index ab75e573c69f,ca3796d9a555..a48bc02cd765
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -37,9 -37,12 +37,13 @@@ obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)	+
  obj-$(CONFIG_X86_P4_CLOCKMOD)		+= p4-clockmod.o
  obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o
  
 -##################################################################################d
 -
 +##################################################################################
  # ARM SoC drivers
  obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o
 +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o
 +obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o
 +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o
+ 
 -
 -##################################################################################d
++##################################################################################
+ # PowerPC platform drivers
+ obj-$(CONFIG_CPU_FREQ_MAPLE)		+= maple-cpufreq.o