Commit 961f8fa0 authored Nov 16, 2012 by Yinghai Lu Committed by H. Peter Anvin Nov 17, 2012

sparc, mm: Remove calling of free_all_bootmem_node()



Now NO_BOOTMEM version free_all_bootmem_node() does not really
do free_bootmem at all, and it only call
register_page_bootmem_info_node instead.

That is confusing, try to kill that free_all_bootmem_node().

Before that, this patch will remove calling of free_all_bootmem_node()

We add register_page_bootmem_info() to call register_page_bootmem_info_node
directly.

Also could use free_all_bootmem() for numa case, and it is just
the same as free_low_memory_core_early().

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-45-git-send-email-yinghai@kernel.org


Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: sparclinux@vger.kernel.org
Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent c074eaac

arch/sparc/mm/init_64.c

+11 −13

Original line number	Diff line number	Diff line
		@@ -2021,6 +2021,16 @@ static void __init patch_tlb_miss_handler_bitmap(void)
		flushi(&valid_addr_bitmap_insn[0]);
		}

		static void __init register_page_bootmem_info(void)
		{
		#ifdef CONFIG_NEED_MULTIPLE_NODES
		int i;

		for_each_online_node(i)
		if (NODE_DATA(i)->node_spanned_pages)
		register_page_bootmem_info_node(NODE_DATA(i));
		#endif
		}
		void __init mem_init(void)
		{
		unsigned long codepages, datapages, initpages;
		@@ -2038,20 +2048,8 @@ void __init mem_init(void)

		high_memory = __va(last_valid_pfn << PAGE_SHIFT);

		#ifdef CONFIG_NEED_MULTIPLE_NODES
		{
		int i;
		for_each_online_node(i) {
		if (NODE_DATA(i)->node_spanned_pages != 0) {
		totalram_pages +=
		free_all_bootmem_node(NODE_DATA(i));
		}
		}
		totalram_pages += free_low_memory_core_early(MAX_NUMNODES);
		}
		#else
		register_page_bootmem_info();
		totalram_pages = free_all_bootmem();
		#endif

		/* We subtract one to account for the mem_map_zero page
		* allocated below.