summaryrefslogtreecommitdiff
path: root/mm/nobootmem.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-07-12 10:46:35 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-14 11:45:35 -0700
commiteb40c4c27f1722f058e4713ccfedebac577d5190 (patch)
treeb471a4451c7cab125b3aafced4c77c7958fd711d /mm/nobootmem.c
parente64980405cc6aa74ef178d8d9aa4018c867ceed1 (diff)
downloadlwn-eb40c4c27f1722f058e4713ccfedebac577d5190.tar.gz
lwn-eb40c4c27f1722f058e4713ccfedebac577d5190.zip
memblock, x86: Replace memblock_x86_find_in_range_node() with generic memblock calls
With the previous changes, generic NUMA aware memblock API has feature parity with memblock_x86_find_in_range_node(). There currently are two users - x86 setup_node_data() and __alloc_memory_core_early() in nobootmem.c. This patch converts the former to use memblock_alloc_nid() and the latter memblock_find_range_in_node(), and kills memblock_x86_find_in_range_node() and related functions including find_memory_early_core_early() in page_alloc.c. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310460395-30913-9-git-send-email-tj@kernel.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mm/nobootmem.c')
-rw-r--r--mm/nobootmem.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 5b0eb06ecb4e..c78162668bc4 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -41,8 +41,7 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
if (limit > memblock.current_limit)
limit = memblock.current_limit;
- addr = find_memory_core_early(nid, size, align, goal, limit);
-
+ addr = memblock_find_in_range_node(goal, limit, size, align, nid);
if (!addr)
return NULL;