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 | e782ab421bbba1912c87934bd0e8998630736418 (patch) | |
tree | 496e4ccaeadf3551d4c516b9f36c7c087eef9e3b /mm/page_alloc.c | |
parent | 0932587328d9bd5b500a640fbaff3290c8d4cabf (diff) |
bootmem: Move contig_page_data definition to bootmem.c/nobootmem.c
Now that bootmem.c and nobootmem.c are separate, it's cleaner to
define contig_page_data in each file than in page_alloc.c with #ifdef.
Move it.
This patch doesn't introduce any behavior change.
-v2: According to Andrew, fixed the struct layout.
-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 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 887ce3bd823d..a243a7fd6922 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -4841,15 +4841,6 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) | |||
4841 | dma_reserve = new_dma_reserve; | 4841 | dma_reserve = new_dma_reserve; |
4842 | } | 4842 | } |
4843 | 4843 | ||
4844 | #ifndef CONFIG_NEED_MULTIPLE_NODES | ||
4845 | struct pglist_data __refdata contig_page_data = { | ||
4846 | #ifndef CONFIG_NO_BOOTMEM | ||
4847 | .bdata = &bootmem_node_data[0] | ||
4848 | #endif | ||
4849 | }; | ||
4850 | EXPORT_SYMBOL(contig_page_data); | ||
4851 | #endif | ||
4852 | |||
4853 | void __init free_area_init(unsigned long *zones_size) | 4844 | void __init free_area_init(unsigned long *zones_size) |
4854 | { | 4845 | { |
4855 | free_area_init_node(0, zones_size, | 4846 | free_area_init_node(0, zones_size, |