Merge branch 'master' into x86/memblock

Conflicts & resolutions:

* arch/x86/xen/setup.c

	dc91c728fd "xen: allow extra memory to be in multiple regions"
	24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."

	conflicted on xen_add_extra_mem() updates.  The resolution is
	trivial as the latter just want to replace
	memblock_x86_reserve_range() with memblock_reserve().

* drivers/pci/intel-iommu.c

	166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
	5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."

	conflicted as the former moved the file under drivers/iommu/.
	Resolved by applying the chnages from the latter on the moved
	file.

* mm/Kconfig

	6661672053a "memblock: add NO_BOOTMEM config symbol"
	c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

	conflicted trivially.  Both added config options.  Just
	letting both add their own options resolves the conflict.

* mm/memblock.c

	d1f0ece6cdc "mm/memblock.c: small function definition fixes"
	ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"

	confliected.  The former updates function removed by the
	latter.  Resolution is trivial.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/sparc/mm/init_64.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc arch/x86/mm/init.c
index 0b736b99d92555537d6656384f6704864983483b,87488b93a65ce19695947bc6ca7f58f948e0f24b..a298914058f9c98ebeaba6a84725f7310a1e6f5d
--- 1/arch/x86/mm/init.c
--- 2/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -63,12 -63,11 +63,11 @@@ static void __init find_early_table_spa
  #ifdef CONFIG_X86_32
        /* for fixmap */
        tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);
- 
-       good_end = max_pfn_mapped << PAGE_SHIFT;
  #endif
+       good_end = max_pfn_mapped << PAGE_SHIFT;
  
        base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
 -      if (base == MEMBLOCK_ERROR)
 +      if (!base)
                panic("Cannot find space for the kernel page tables");
  
        pgt_buf_start = base >> PAGE_SHIFT;

diff --cc arch/x86/mm/init_64.c
Simple merge

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

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

diff --cc arch/x86/xen/setup.c
index 73daaf75801aae1275241569d13d01f0a122a04d,38d0af4fefec19f52d5e724c8f08102d391dc2e6..f5e1362550e76130eb4b770e926825ec76cb56f1
--- 1/arch/x86/xen/setup.c
--- 2/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@@ -50,26 -54,32 +54,32 @@@ unsigned long xen_released_pages
   */
  #define EXTRA_MEM_RATIO               (10)
  
- static void __init xen_add_extra_mem(unsigned long pages)
+ static void __init xen_add_extra_mem(u64 start, u64 size)
  {
        unsigned long pfn;
+       int i;
  
-       u64 size = (u64)pages * PAGE_SIZE;
-       u64 extra_start = xen_extra_mem_start + xen_extra_mem_size;
- 
-       if (!pages)
-               return;
- 
-       e820_add_region(extra_start, size, E820_RAM);
-       sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
- 
-       memblock_reserve(extra_start, size);
+       for (i = 0; i < XEN_EXTRA_MEM_MAX_REGIONS; i++) {
+               /* Add new region. */
+               if (xen_extra_mem[i].size == 0) {
+                       xen_extra_mem[i].start = start;
+                       xen_extra_mem[i].size  = size;
+                       break;
+               }
+               /* Append to existing region. */
+               if (xen_extra_mem[i].start + xen_extra_mem[i].size == start) {
+                       xen_extra_mem[i].size += size;
+                       break;
+               }
+       }
+       if (i == XEN_EXTRA_MEM_MAX_REGIONS)
+               printk(KERN_WARNING "Warning: not enough extra memory regions\n");
  
-       xen_extra_mem_size += size;
 -      memblock_x86_reserve_range(start, start + size, "XEN EXTRA");
++      memblock_reserve(start, size);
  
-       xen_max_p2m_pfn = PFN_DOWN(extra_start + size);
+       xen_max_p2m_pfn = PFN_DOWN(start + size);
  
-       for (pfn = PFN_DOWN(extra_start); pfn <= xen_max_p2m_pfn; pfn++)
+       for (pfn = PFN_DOWN(start); pfn <= xen_max_p2m_pfn; pfn++)
                __set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
  }
  

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

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

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

diff --cc kernel/printk.c
Simple merge

diff --cc mm/Kconfig
index 7c5697116fcf86bd4e4c7ad0ee9c42e4f3c04834,011b110365c8681d7b1c546223bdb8a2daccc59d..e338407f1225f0873a8eb20761c86fd82db1dfc0
--- 1/mm/Kconfig
--- 2/mm/Kconfig
+++ b/mm/Kconfig
@@@ -131,12 -131,9 +131,15 @@@ config SPARSEMEM_VMEMMA
  config HAVE_MEMBLOCK
        boolean
  
 +config HAVE_MEMBLOCK_NODE_MAP
 +      boolean
 +
 +config ARCH_DISCARD_MEMBLOCK
 +      boolean
 +
+ config NO_BOOTMEM
+       boolean
+ 
  # eventually, we can have this option just 'select SPARSEMEM'
  config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"

diff --cc mm/memblock.c
Simple merge

diff --cc mm/nobootmem.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge