Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a2164a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)
  memblock: Reimplement memblock allocation using reverse free area iterator
  memblock: Kill early_node_map[]
  score: Use HAVE_MEMBLOCK_NODE_MAP
  s390: Use HAVE_MEMBLOCK_NODE_MAP
  mips: Use HAVE_MEMBLOCK_NODE_MAP
  ia64: Use HAVE_MEMBLOCK_NODE_MAP
  SuperH: Use HAVE_MEMBLOCK_NODE_MAP
  sparc: Use HAVE_MEMBLOCK_NODE_MAP
  powerpc: Use HAVE_MEMBLOCK_NODE_MAP
  memblock: Implement memblock_add_node()
  memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users
  memblock: Track total size of regions automatically
  powerpc: Cleanup memblock usage
  memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()
  memblock: Make memblock functions handle overflowing range @size
  memblock: Reimplement __memblock_remove() using memblock_isolate_range()
  memblock: Separate out memblock_isolate_range() from memblock_set_node()
  memblock: Kill memblock_init()
  memblock: Kill sentinel entries at the end of static region arrays
  memblock: Add __memblock_dump_all()
  ...
parents 15f043a6 45aa0663

arch/arm/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <asm/mach/time.h>

#include <asm/traps.h>

#include <asm/unwind.h>

#include <asm/memblock.h>



#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)

#include "compat.h"

arch/arm/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>



#include "mm.h"
@@ -332,7 +333,6 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) 


	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);



	memblock_init();

	for (i = 0; i < mi->nr_banks; i++)

		memblock_add(mi->bank[i].start, mi->bank[i].size);
@@ -371,7 +371,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) 
	if (mdesc->reserve)

		mdesc->reserve();



	memblock_analyze();

	memblock_allow_resize();

	memblock_dump_all();

}

arch/ia64/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ config IA64 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_GENERIC_HARDIRQS

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select ARCH_DISCARD_MEMBLOCK

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select IRQ_PER_CPU
@@ -474,9 +477,6 @@ config NODES_SHIFT 
	  MAX_NUMNODES will be 2^(This value).

	  If in doubt, use the default.



config ARCH_POPULATES_NODE_MAP

	def_bool y



# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.

# VIRTUAL_MEM_MAP has been retained for historical reasons.

config VIRTUAL_MEM_MAP

arch/ia64/mm/contig.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */

#include <linux/bootmem.h>

#include <linux/efi.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/nmi.h>

#include <linux/swap.h>
@@ -348,7 +349,7 @@ paging_init (void) 
		printk("Virtual mem_map starts at 0x%p\n", mem_map);

	}

#else /* !CONFIG_VIRTUAL_MEM_MAP */

	add_active_range(0, 0, max_low_pfn);

	memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);

	free_area_init_nodes(max_zone_pfns);

#endif /* !CONFIG_VIRTUAL_MEM_MAP */

	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));

arch/ia64/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/bootmem.h>

#include <linux/efi.h>

#include <linux/elf.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/mmzone.h>

#include <linux/module.h>
@@ -557,8 +558,7 @@ int __init register_active_ranges(u64 start, u64 len, int nid) 
#endif



	if (start < end)

		add_active_range(nid, __pa(start) >> PAGE_SHIFT,

			__pa(end) >> PAGE_SHIFT);

		memblock_add_node(__pa(start), end - start, nid);

	return 0;

}