patch-2.4.0-test10 linux/arch/arm/mm/init.c

• Lines: 77
• Date: Mon Oct 16 15:25:46 2000
• Orig file: v2.4.0-test9/linux/arch/arm/mm/init.c
• Orig date: Sun Oct 8 10:50:06 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/arm/mm/init.c linux/arch/arm/mm/init.c
@@ -56,7 +56,7 @@
  * The sole use of this is to pass memory configuration
  * data from paging_init to mem_init.
  */
-static struct meminfo __initdata meminfo;
+static struct meminfo meminfo __initdata = { 0, };
 
 /*
  * empty_bad_page is the page that is used for page faults when
@@ -383,27 +383,27 @@
 	 * Register the kernel text and data with bootmem.
 	 * Note that this can only be in node 0.
 	 */
-	reserve_bootmem_node(0, __pa(&_stext), &_end - &_stext);
+	reserve_bootmem_node(NODE_DATA(0), __pa(&_stext), &_end - &_stext);
 
 #ifdef CONFIG_CPU_32
 	/*
 	 * Reserve the page tables.  These are already in use,
 	 * and can only be in node 0.
 	 */
-	reserve_bootmem_node(0, __pa(swapper_pg_dir),
+	reserve_bootmem_node(NODE_DATA(0), __pa(swapper_pg_dir),
 			     PTRS_PER_PGD * sizeof(void *));
 #else
 	/*
 	 * Stop this memory from being grabbed - its special DMA
 	 * memory that is required for the screen.
 	 */
-	reserve_bootmem_node(0, 0x02000000, 0x00080000);
+	reserve_bootmem_node(NODE_DATA(0), 0x02000000, 0x00080000);
 #endif
 	/*
 	 * And don't forget to reserve the allocator bitmap,
 	 * which will be freed later.
 	 */
-	reserve_bootmem_node(0, bootmap_pfn << PAGE_SHIFT,
+	reserve_bootmem_node(NODE_DATA(0), bootmap_pfn << PAGE_SHIFT,
 			     bootmap_pages << PAGE_SHIFT);
 }
 
@@ -416,7 +416,7 @@
 
 	for (bank = 0; bank < mi->nr_banks; bank++)
 		if (mi->bank[bank].node == node)
-			free_bootmem_node(node, mi->bank[bank].start,
+			free_bootmem_node(NODE_DATA(node), mi->bank[bank].start,
 					  mi->bank[bank].size);
 }
 
@@ -450,7 +450,7 @@
 		/*
 		 * Initialise the bootmem allocator.
 		 */
-		init_bootmem_node(node, map_pg, np->start, np->end);
+		init_bootmem_node(NODE_DATA(node), map_pg, np->start, np->end);
 		free_bootmem_node_bank(node, mi);
 		map_pg += np->bootmap_pages;
 
@@ -465,7 +465,7 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_node >= 0)
-		reserve_bootmem_node(initrd_node, __pa(initrd_start),
+		reserve_bootmem_node(NODE_DATA(initrd_node), __pa(initrd_start),
 				     initrd_end - initrd_start);
 #endif
 
@@ -583,7 +583,7 @@
 
 	/* this will put all unused low memory onto the freelists */
 	for (node = 0; node < numnodes; node++)
-		totalram_pages += free_all_bootmem_node(node);
+		totalram_pages += free_all_bootmem_node(NODE_DATA(node));
 
 	/*
 	 * Since our memory may not be contiguous, calculate the