diff options
author | Yinghai Lu <yinghai@kernel.org> | 2011-02-24 08:43:06 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-02-24 08:43:06 -0500 |
commit | 8bc1f91e1f0e977fb95b11d8fa686f5091888110 (patch) | |
tree | e7c6369b20e5e37176b91a93a8ea621df8c9d893 /mm/page_alloc.c | |
parent | e782ab421bbba1912c87934bd0e8998630736418 (diff) |
bootmem: Move __alloc_memory_core_early() to nobootmem.c
Now that bootmem.c and nobootmem.c are separate, there's no reason to
define __alloc_memory_core_early(), which is used only by nobootmem,
inside #ifdef in page_alloc.c. Move it to nobootmem.c and make it
static.
This patch doesn't introduce any behavior change.
-tj: Updated commit description.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a243a7fd6922..603513609ba5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3780,34 +3780,6 @@ int __init add_from_early_node_map(struct range *range, int az, | |||
3780 | return nr_range; | 3780 | return nr_range; |
3781 | } | 3781 | } |
3782 | 3782 | ||
3783 | #ifdef CONFIG_NO_BOOTMEM | ||
3784 | void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, | ||
3785 | u64 goal, u64 limit) | ||
3786 | { | ||
3787 | void *ptr; | ||
3788 | u64 addr; | ||
3789 | |||
3790 | if (limit > memblock.current_limit) | ||
3791 | limit = memblock.current_limit; | ||
3792 | |||
3793 | addr = find_memory_core_early(nid, size, align, goal, limit); | ||
3794 | |||
3795 | if (addr == MEMBLOCK_ERROR) | ||
3796 | return NULL; | ||
3797 | |||
3798 | ptr = phys_to_virt(addr); | ||
3799 | memset(ptr, 0, size); | ||
3800 | memblock_x86_reserve_range(addr, addr + size, "BOOTMEM"); | ||
3801 | /* | ||
3802 | * The min_count is set to 0 so that bootmem allocated blocks | ||
3803 | * are never reported as leaks. | ||
3804 | */ | ||
3805 | kmemleak_alloc(ptr, size, 0, 0); | ||
3806 | return ptr; | ||
3807 | } | ||
3808 | #endif | ||
3809 | |||
3810 | |||
3811 | void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data) | 3783 | void __init work_with_active_regions(int nid, work_fn_t work_fn, void *data) |
3812 | { | 3784 | { |
3813 | int i; | 3785 | int i; |