Merge branch 'stable/for-linus-fixes-3.3' into linux-next

* stable/for-linus-fixes-3.3: (30 commits)
  xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
  memblock: Cast phys_addr_t to unsigned long long for printf use
  memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones
  memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option
  x86: Use absent_pages_in_range() instead of memblock_x86_hole_size()
  memblock, x86: Reimplement memblock_find_dma_reserve() using iterators
  memblock, x86: Replace __get_free_all_memory_range() with for_each_free_mem_range()
  memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only
  x86: Replace memblock_x86_find_in_range_size() with for_each_free_mem_range()
  memblock: Implement for_each_free_mem_range()
  x86: Use __memblock_alloc_base() in early_reserve_e820()
  x86: Use HAVE_MEMBLOCK_NODE_MAP
  memblock: Add optional region->nid
  memblock: Use __meminit[data] instead of __init[data]
  memblock: Reimplement memblock_add_region()
  memblock: Remove memblock_memory_can_coalesce()
  memblock, x86: Replace memblock_x86_find_in_range_node() with generic memblock calls
  memblock: Separate out memblock_find_in_range_node()
  memblock: Make memblock_alloc_[try_]nid() top-down
  memblock: Don't allow archs to override memblock_nid_range()
  ...

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/e820.h
index c9547033e38e8fee78964ffda671d9e3402a4455,37782566af241dca3d6e0c8264935dc3e0a16258..fae354bae275c2db77375756437cd2a8e7b07040
--- 1/arch/x86/include/asm/e820.h
--- 2/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@@ -122,10 -115,9 +122,10 @@@ static inline void early_memtest(unsign
  }
  #endif
  
 +extern unsigned long e820_end_pfn(unsigned long limit_pfn, unsigned type);
  extern unsigned long e820_end_of_ram_pfn(void);
  extern unsigned long e820_end_of_low_ram_pfn(void);
- extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);
+ extern u64 early_reserve_e820(u64 sizet, u64 align);
  
  void memblock_x86_fill(void);
  void memblock_find_dma_reserve(void);

diff --cc arch/x86/kernel/e820.c
Simple merge

diff --cc arch/x86/kernel/mpparse.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc arch/x86/xen/setup.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge