]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[IA64] trim output of show_mem()
authorJes Sorensen <jes@sgi.com>
Thu, 14 Sep 2006 11:10:30 +0000 (07:10 -0400)
committerTony Luck <tony.luck@intel.com>
Tue, 26 Sep 2006 21:16:56 +0000 (14:16 -0700)
Cut the number of lines of memory info output per node from five
to one line.

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/mm/discontig.c

index 0ce247444f21c10b582b4575b5fc016913558378..6ea2797663343695f696cc0bda9c0617d804b26b 100644 (file)
@@ -551,12 +551,12 @@ void show_mem(void)
        show_free_areas();
        printk(KERN_INFO "Free swap:       %6ldkB\n",
               nr_swap_pages<<(PAGE_SHIFT-10));
+       printk(KERN_INFO "Node memory in pages:\n");
        for_each_online_pgdat(pgdat) {
                unsigned long present;
                unsigned long flags;
                int shared = 0, cached = 0, reserved = 0;
 
-               printk(KERN_INFO "Node ID: %d\n", pgdat->node_id);
                pgdat_resize_lock(pgdat, &flags);
                present = pgdat->node_present_pages;
                for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -580,10 +580,9 @@ void show_mem(void)
                total_reserved += reserved;
                total_cached += cached;
                total_shared += shared;
-               printk(KERN_INFO "\t%ld pages of RAM\n", present);
-               printk(KERN_INFO "\t%d reserved pages\n", reserved);
-               printk(KERN_INFO "\t%d pages shared\n", shared);
-               printk(KERN_INFO "\t%d pages swap cached\n", cached);
+               printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
+                      "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                      present, reserved, shared, cached);
        }
        printk(KERN_INFO "%ld pages of RAM\n", total_present);
        printk(KERN_INFO "%d reserved pages\n", total_reserved);