diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2011-02-24 14:43:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-24 14:43:06 +0100 |
| commit | e782ab421bbba1912c87934bd0e8998630736418 (patch) | |
| tree | 496e4ccaeadf3551d4c516b9f36c7c087eef9e3b /mm | |
| parent | 0932587328d9bd5b500a640fbaff3290c8d4cabf (diff) | |
| download | linux-e782ab421bbba1912c87934bd0e8998630736418.tar.gz | |
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')
| -rw-r--r-- | mm/bootmem.c | 7 | ||||
| -rw-r--r-- | mm/nobootmem.c | 5 | ||||
| -rw-r--r-- | mm/page_alloc.c | 9 |
3 files changed, 12 insertions, 9 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index 4403e2fbc13d..07aeb89e396e 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -23,6 +23,13 @@ #include "internal.h" +#ifndef CONFIG_NEED_MULTIPLE_NODES +struct pglist_data __refdata contig_page_data = { + .bdata = &bootmem_node_data[0] +}; +EXPORT_SYMBOL(contig_page_data); +#endif + unsigned long max_low_pfn; unsigned long min_low_pfn; unsigned long max_pfn; diff --git a/mm/nobootmem.c b/mm/nobootmem.c index f220b8d0a97d..6a018e49b7be 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -23,6 +23,11 @@ #include "internal.h" +#ifndef CONFIG_NEED_MULTIPLE_NODES +struct pglist_data __refdata contig_page_data; +EXPORT_SYMBOL(contig_page_data); +#endif + unsigned long max_low_pfn; unsigned long min_low_pfn; unsigned long max_pfn; 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) dma_reserve = new_dma_reserve; } -#ifndef CONFIG_NEED_MULTIPLE_NODES -struct pglist_data __refdata contig_page_data = { -#ifndef CONFIG_NO_BOOTMEM - .bdata = &bootmem_node_data[0] -#endif - }; -EXPORT_SYMBOL(contig_page_data); -#endif - void __init free_area_init(unsigned long *zones_size) { free_area_init_node(0, zones_size, |