Commit 64a02daa authored by Tejun Heo's avatar Tejun Heo Committed by H. Peter Anvin
Browse files

memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only

nomemblock is currently used only by x86 and on x86_32
free_all_memory_core_early() silently freed only the low mem because
get_free_all_memory_range() in arch/x86/mm/memblock.c implicitly
limited range to max_low_pfn.

Rename free_all_memory_core_early() to free_low_memory_core_early()
and make it call __get_free_all_memory_range() and limit the range to
max_low_pfn explicitly.  This makes things clearer and also is
consistent with the bootmem behavior.

This leaves get_free_all_memory_range() without any user.  Kill it.
Signed-off-by: default avatarTejun Heo <>

Cc: Yinghai Lu <>
Cc: Benjamin Herrenschmidt <>
Cc: Thomas Gleixner <>
Cc: Ingo Molnar <>
Cc: "H. Peter Anvin" <>
Signed-off-by: default avatarH. Peter Anvin <>
parent 8d89ac80
......@@ -8,7 +8,6 @@ void memblock_x86_free_range(u64 start, u64 end);
struct range;
int __get_free_all_memory_range(struct range **range, int nodeid,
unsigned long start_pfn, unsigned long end_pfn);
int get_free_all_memory_range(struct range **rangep, int nodeid);
u64 memblock_x86_hole_size(u64 start, u64 end);
u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit);
......@@ -89,16 +89,6 @@ int __init __get_free_all_memory_range(struct range **rangep, int nodeid,
return nr_range;
int __init get_free_all_memory_range(struct range **rangep, int nodeid)
unsigned long end_pfn = -1UL;
#ifdef CONFIG_X86_32
end_pfn = max_low_pfn;
return __get_free_all_memory_range(rangep, nodeid, 0, end_pfn);
static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
int i, count;
......@@ -19,7 +19,7 @@ unsigned long __init numa_free_all_bootmem(void)
pages += free_all_bootmem_node(NODE_DATA(i));
pages += free_all_memory_core_early(MAX_NUMNODES);
pages += free_low_memory_core_early(MAX_NUMNODES);
return pages;
......@@ -44,7 +44,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat,
unsigned long endpfn);
extern unsigned long init_bootmem(unsigned long addr, unsigned long memend);
unsigned long free_all_memory_core_early(int nodeid);
extern unsigned long free_low_memory_core_early(int nodeid);
extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);
extern unsigned long free_all_bootmem(void);
......@@ -106,7 +106,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
__free_pages_bootmem(pfn_to_page(i), 0);
unsigned long __init free_all_memory_core_early(int nodeid)
unsigned long __init free_low_memory_core_early(int nodeid)
int i;
u64 start, end;
......@@ -114,7 +114,7 @@ unsigned long __init free_all_memory_core_early(int nodeid)
struct range *range = NULL;
int nr_range;
nr_range = get_free_all_memory_range(&range, nodeid);
nr_range = __get_free_all_memory_range(&range, nodeid, 0, max_low_pfn);
for (i = 0; i < nr_range; i++) {
start = range[i].start;
......@@ -136,7 +136,7 @@ unsigned long __init free_all_bootmem_node(pg_data_t *pgdat)
/* free_all_memory_core_early(MAX_NUMNODES) will be called later */
/* free_low_memory_core_early(MAX_NUMNODES) will be called later */
return 0;
......@@ -154,7 +154,7 @@ unsigned long __init free_all_bootmem(void)
* Use MAX_NUMNODES will make sure all ranges in early_node_map[]
* will be used instead of only Node0 related
return free_all_memory_core_early(MAX_NUMNODES);
return free_low_memory_core_early(MAX_NUMNODES);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment