mm: move bootmem descriptors definition to a single place

There are a lot of places that define either a single bootmem descriptor or an
array of them.  Use only one central array with MAX_NUMNODES items instead.

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 10ab7833e83c..a53fda0481ca 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -19,7 +19,6 @@
 #include <asm/pgalloc.h>
 
 pg_data_t node_data[MAX_NUMNODES];
-bootmem_data_t node_bdata[MAX_NUMNODES];
 EXPORT_SYMBOL(node_data);
 
 #undef DEBUG_DISCONTIG
@@ -141,7 +140,7 @@ setup_memory_node(int nid, void *kernel_end)
                 printk(" not enough mem to reserve NODE_DATA");
                 return;
         }
-        NODE_DATA(nid)->bdata = &node_bdata[nid];
+        NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
 
         printk(" Detected node memory:   start %8lu, end %8lu\n",
                node_min_pfn, node_max_pfn);
@@ -304,8 +303,9 @@ void __init paging_init(void)
         dma_local_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
 
         for_each_online_node(nid) {
-                unsigned long start_pfn = node_bdata[nid].node_boot_start >> PAGE_SHIFT;
-                unsigned long end_pfn = node_bdata[nid].node_low_pfn;
+                bootmem_data_t *bdata = &bootmem_node_data[nid];
+                unsigned long start_pfn = bdata->node_boot_start >> PAGE_SHIFT;
+                unsigned long end_pfn = bdata->node_low_pfn;
 
                 if (dma_local_pfn >= end_pfn - start_pfn)
                         zones_size[ZONE_DMA] = end_pfn - start_pfn;