]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 05:59:39 +0000 (22:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 05:59:39 +0000 (22:59 -0700)
* '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

31 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/powerpc/Kconfig
arch/powerpc/Makefile
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/reg.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/head_fsl_booke.S
arch/powerpc/kernel/mpc7450-pmu.c
arch/powerpc/kernel/pci-common.c
arch/powerpc/kernel/pci_32.c
arch/powerpc/kernel/perf_event.c
arch/powerpc/kernel/power4-pmu.c
arch/powerpc/kernel/power5+-pmu.c
arch/powerpc/kernel/power5-pmu.c
arch/powerpc/kernel/power6-pmu.c
arch/powerpc/kernel/power7-pmu.c
arch/powerpc/kernel/ppc970-pmu.c
arch/powerpc/kernel/process.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/smp.c
arch/powerpc/platforms/pseries/hotplug-memory.c
arch/powerpc/platforms/pseries/smp.c
arch/powerpc/sysdev/fsl_pci.c
arch/powerpc/sysdev/ppc4xx_pci.c
drivers/Kconfig
drivers/Makefile
drivers/cpufreq/Kconfig
drivers/cpufreq/Makefile
drivers/of/platform.c

Simple merge
diff --cc MAINTAINERS
Simple merge
index cdf7a0a644064c3ec7a1d94ee6412d88e963980c,f8e578be58061021298e11cad87910a6b1a12204..374c475e56a3238bf5e55e161cd13d44a468d7be
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 09a85a9045d60f5a03a848da386ad44f5b69436a,567a1746ed74225f9c842bf54c907a5ceb40bf3a..f932f8a0cf0c590eedd636938652fdef5f93d22e
@@@ -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)
  {
Simple merge
Simple merge
Simple merge
diff --cc drivers/Kconfig
index 9e7a4f5b5c2ee6f2b11c026d09e3c40c10a887aa,3c1d4a59a8648090d1be77b829069160793cb485..95b9e7eefadc9b5b14493977524139d29bb16f61
@@@ -126,6 -126,6 +126,8 @@@ source "drivers/hwspinlock/Kconfig
  
  source "drivers/clocksource/Kconfig"
  
 +source "drivers/iommu/Kconfig"
 +
+ source "drivers/virt/Kconfig"
  endmenu
index 939fcdeb2d31a02f77ec7b5cecbd4cb0921da370,cd546ebab9a756a9b7748e61aa9b5ffe3f5b6b41..7fa433a7030c4e00d300e000702ce7775dbc74b2
@@@ -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/
index e898215b88af90df9bf77332b7bb08270bbbf1da,61ae639de9d4cd6921d66c327b8541edce3207b8..e24a2a1b666661aab161c508bc6696bd3fe7979f
@@@ -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
index ab75e573c69f443fcfc68eea1ce4817bbf5b9c8e,ca3796d9a5552fb51cce8af96d3257ed3a5967dd..a48bc02cd76539219f90ab9b4da5d4a1f7a9bfdf
@@@ -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
 -
 -##################################################################################d
 +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)     += s3c64xx-cpufreq.o
 +obj-$(CONFIG_ARM_S5PV210_CPUFREQ)     += s5pv210-cpufreq.o
 +obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)  += exynos4210-cpufreq.o
++##################################################################################
+ # PowerPC platform drivers
+ obj-$(CONFIG_CPU_FREQ_MAPLE)          += maple-cpufreq.o
Simple merge