Skip to content

Commit

Permalink
x86, mm: kill numa_free_all_bootmem()
Browse files Browse the repository at this point in the history
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 numa_free_all_bootmem().

That function could be replaced with register_page_bootmem_info() and
free_all_bootmem();

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-43-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Yinghai Lu authored and H. Peter Anvin committed Nov 17, 2012
1 parent b8fd39c commit 94b43c3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
2 changes: 0 additions & 2 deletions arch/x86/include/asm/numa_64.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#ifndef _ASM_X86_NUMA_64_H
#define _ASM_X86_NUMA_64_H

extern unsigned long numa_free_all_bootmem(void);

#endif /* _ASM_X86_NUMA_64_H */
15 changes: 11 additions & 4 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,16 @@ EXPORT_SYMBOL_GPL(arch_add_memory);

static struct kcore_list kcore_vsyscall;

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

for_each_online_node(i)
register_page_bootmem_info_node(NODE_DATA(i));
#endif
}

void __init mem_init(void)
{
long codesize, reservedpages, datasize, initsize;
Expand All @@ -641,11 +651,8 @@ void __init mem_init(void)
reservedpages = 0;

/* this will put all low memory onto the freelists */
#ifdef CONFIG_NUMA
totalram_pages = numa_free_all_bootmem();
#else
register_page_bootmem_info();
totalram_pages = free_all_bootmem();
#endif

absent_pages = absent_pages_in_range(0, max_pfn);
reservedpages = max_pfn - totalram_pages - absent_pages;
Expand Down
13 changes: 0 additions & 13 deletions arch/x86/mm/numa_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,3 @@ void __init initmem_init(void)
{
x86_numa_init();
}

unsigned long __init numa_free_all_bootmem(void)
{
unsigned long pages = 0;
int i;

for_each_online_node(i)
pages += free_all_bootmem_node(NODE_DATA(i));

pages += free_low_memory_core_early(MAX_NUMNODES);

return pages;
}

0 comments on commit 94b43c3

Please sign in to comment.