aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2011-02-24 08:43:06 -0500
committerTejun Heo <tj@kernel.org>2011-02-24 08:43:06 -0500
commite782ab421bbba1912c87934bd0e8998630736418 (patch)
tree496e4ccaeadf3551d4c516b9f36c7c087eef9e3b
parent0932587328d9bd5b500a640fbaff3290c8d4cabf (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>
-rw-r--r--mm/bootmem.c7
-rw-r--r--mm/nobootmem.c5
-rw-r--r--mm/page_alloc.c9
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 @@
23 23
24#include "internal.h" 24#include "internal.h"
25 25
26#ifndef CONFIG_NEED_MULTIPLE_NODES
27struct pglist_data __refdata contig_page_data = {
28 .bdata = &bootmem_node_data[0]
29};
30EXPORT_SYMBOL(contig_page_data);
31#endif
32
26unsigned long max_low_pfn; 33unsigned long max_low_pfn;
27unsigned long min_low_pfn; 34unsigned long min_low_pfn;
28unsigned long max_pfn; 35unsigned 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 @@
23 23
24#include "internal.h" 24#include "internal.h"
25 25
26#ifndef CONFIG_NEED_MULTIPLE_NODES
27struct pglist_data __refdata contig_page_data;
28EXPORT_SYMBOL(contig_page_data);
29#endif
30
26unsigned long max_low_pfn; 31unsigned long max_low_pfn;
27unsigned long min_low_pfn; 32unsigned long min_low_pfn;
28unsigned long max_pfn; 33unsigned 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)
4841 dma_reserve = new_dma_reserve; 4841 dma_reserve = new_dma_reserve;
4842} 4842}
4843 4843
4844#ifndef CONFIG_NEED_MULTIPLE_NODES
4845struct pglist_data __refdata contig_page_data = {
4846#ifndef CONFIG_NO_BOOTMEM
4847 .bdata = &bootmem_node_data[0]
4848#endif
4849 };
4850EXPORT_SYMBOL(contig_page_data);
4851#endif
4852
4853void __init free_area_init(unsigned long *zones_size) 4844void __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,