diff options
-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 @@ | |||
23 | 23 | ||
24 | #include "internal.h" | 24 | #include "internal.h" |
25 | 25 | ||
26 | #ifndef CONFIG_NEED_MULTIPLE_NODES | ||
27 | struct pglist_data __refdata contig_page_data = { | ||
28 | .bdata = &bootmem_node_data[0] | ||
29 | }; | ||
30 | EXPORT_SYMBOL(contig_page_data); | ||
31 | #endif | ||
32 | |||
26 | unsigned long max_low_pfn; | 33 | unsigned long max_low_pfn; |
27 | unsigned long min_low_pfn; | 34 | unsigned long min_low_pfn; |
28 | unsigned long max_pfn; | 35 | 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 @@ | |||
23 | 23 | ||
24 | #include "internal.h" | 24 | #include "internal.h" |
25 | 25 | ||
26 | #ifndef CONFIG_NEED_MULTIPLE_NODES | ||
27 | struct pglist_data __refdata contig_page_data; | ||
28 | EXPORT_SYMBOL(contig_page_data); | ||
29 | #endif | ||
30 | |||
26 | unsigned long max_low_pfn; | 31 | unsigned long max_low_pfn; |
27 | unsigned long min_low_pfn; | 32 | unsigned long min_low_pfn; |
28 | unsigned long max_pfn; | 33 | 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) | |||
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, |