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/percpu.c | |
parent | c252a5bb1f57afb1e336d68085217727ca7b2134 (diff) | |
download | kernel_samsung_crespo-08677214e318297f228237be0042aac754f48f1d.zip kernel_samsung_crespo-08677214e318297f228237be0042aac754f48f1d.tar.gz kernel_samsung_crespo-08677214e318297f228237be0042aac754f48f1d.tar.bz2 |
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/percpu.c')
-rw-r--r-- | mm/percpu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 083e7c9..841defe 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1929,7 +1929,10 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size, } /* copy and return the unused part */ memcpy(ptr, __per_cpu_load, ai->static_size); +#ifndef CONFIG_NO_BOOTMEM + /* fix partial free ! */ free_fn(ptr + size_sum, ai->unit_size - size_sum); +#endif } } |