diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2010-02-10 01:20:20 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-12 09:41:59 -0800 |
| commit | 08677214e318297f228237be0042aac754f48f1d (patch) | |
| tree | 6d03424f7e287fcf66136b44512328afb1aeee49 /mm/sparse-vmemmap.c | |
| parent | c252a5bb1f57afb1e336d68085217727ca7b2134 (diff) | |
| download | linux-3.10-08677214e318297f228237be0042aac754f48f1d.tar.gz linux-3.10-08677214e318297f228237be0042aac754f48f1d.tar.bz2 linux-3.10-08677214e318297f228237be0042aac754f48f1d.zip | |
x86: Make 64 bit use early_res instead of bootmem before slab
Finally we can use early_res to replace bootmem for x86_64 now.
Still can use CONFIG_NO_BOOTMEM to enable it or not.
-v2: fix 32bit compiling about MAX_DMA32_PFN
-v3: folded bug fix from LKML message below
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B747239.4070907@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mm/sparse-vmemmap.c')
| -rw-r--r-- | mm/sparse-vmemmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index d9714bdcb4a..9506c39942f 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -40,7 +40,7 @@ static void * __init_refok __earlyonly_bootmem_alloc(int node, unsigned long align, unsigned long goal) { - return __alloc_bootmem_node(NODE_DATA(node), size, align, goal); + return __alloc_bootmem_node_high(NODE_DATA(node), size, align, goal); } |