[PATCH] Fix the boot-time reporting of each zone's available pages

Patch from Bjorn Helgaas, via Rusty.

Change:

  On node 0 totalpages: 61031         <--- not including holes
  zone(0): 65172 pages.               <--- including holes
  zone(1): 0 pages.                   ...
  zone(2): 0 pages.

to:

  On node 0 totalpages: 61031         <--- not including holes
  DMA zone: 61031 pages               <--- not including holes
  Normal zone: 0 pages
  HighMem zone: 0 pages

mm/page_alloc.c

@@ -782,10 +782,9 @@ void __init free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap,
 	const unsigned long zone_required_alignment = 1UL << (MAX_ORDER-1);
 
 	totalpages = 0;
-	for (i = 0; i < MAX_NR_ZONES; i++) {
-		unsigned long size = zones_size[i];
-		totalpages += size;
-	}
+	for (i = 0; i < MAX_NR_ZONES; i++)
+		totalpages += zones_size[i];
+
 	realtotalpages = totalpages;
 	if (zholes_size)
 		for (i = 0; i < MAX_NR_ZONES; i++)
@@ -823,7 +822,7 @@ void __init free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap,
 		if (zholes_size)
 			realsize -= zholes_size[j];
 
-		printk("zone(%lu): %lu pages.\n", j, size);
+		printk("  %s zone: %lu pages\n", zone_names[j], realsize);
 		zone->size = size;
 		zone->name = zone_names[j];
 		spin_lock_init(&zone->lock);