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

Commit 98e4ae8a authored by Tejun Heo's avatar Tejun Heo
Browse files

ia64: Use HAVE_MEMBLOCK_NODE_MAP 



ia64 used early_node_map[] just to prime free_area_init_nodes().  Now
memblock can be used for the same purpose and early_node_map[] is
scheduled to be dropped.  Use memblock instead.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
parent 534cfbee

arch/ia64/Kconfig

+3 −0
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

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;

}