Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm

[~andy/linux] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 4403e2fbc13ddfbe1d34741caf7379a3789636b4..07aeb89e396ea140dbd7a28640aacb8fa2707b9a 100644 (file)
--- 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;