From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 04:19:54 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.37-rc1~180
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d4429f608abde89e8bc1e24b43cd503feb95c496;p=~shefty%2Frdma-dev.git

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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
  powerpc/44x: Update ppc44x_defconfig
  powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option
  fsl_rio: Add comments for sRIO registers.
  powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
  powerpc/fsl-booke: Add p5020 DS board support
  powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
  powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
  powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
  powerpc/85xx: add cache-sram support
  powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
  powerpc: Fix compile error with paca code on ppc64e
  powerpc/fsl-booke: Add p3041 DS board support
  oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
  powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
  powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
  powerpc/fsl_booke: Add support to boot from core other than 0
  powerpc/p1022: Add probing for individual DMA channels
  powerpc/fsl_soc: Search all global-utilities nodes for rstccr
  powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
  powerpc/mpc83xx: Support for MPC8308 P1M board
  ...

Fix up conflict with the generic irq_work changes in arch/powerpc/kernel/time.c
---

d4429f608abde89e8bc1e24b43cd503feb95c496
diff --cc arch/powerpc/kernel/time.c
index 54888eb10c3,644f9188d8e..010406958d9
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -585,11 -578,9 +578,9 @@@ void timer_interrupt(struct pt_regs * r
  	old_regs = set_irq_regs(regs);
  	irq_enter();
  
- 	calculate_steal_time();
- 
 -	if (test_perf_event_pending()) {
 -		clear_perf_event_pending();
 -		perf_event_do_pending();
 +	if (test_irq_work_pending()) {
 +		clear_irq_work_pending();
 +		irq_work_run();
  	}
  
  #ifdef CONFIG_PPC_ISERIES
diff --cc arch/powerpc/mm/fsl_booke_mmu.c
index cde270847e7,67bc8a7c7e0..f7802c8bba0
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@@ -214,14 -215,6 +216,15 @@@ void __init adjust_total_lowmem(void
  	pr_cont("%lu Mb, residual: %dMb\n", tlbcam_sz(tlbcam_index - 1) >> 20,
  	        (unsigned int)((total_lowmem - __max_low_memory) >> 20));
  
 -	__initial_memory_limit_addr = memstart_addr + __max_low_memory;
 +	memblock_set_current_limit(memstart_addr + __max_low_memory);
 +}
 +
 +void setup_initial_memory_limit(phys_addr_t first_memblock_base,
 +				phys_addr_t first_memblock_size)
 +{
 +	phys_addr_t limit = first_memblock_base + first_memblock_size;
 +
 +	/* 64M mapped initially according to head_fsl_booke.S */
 +	memblock_set_current_limit(min_t(u64, limit, 0x04000000));
  }
+ #endif