summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-09-14 07:10:30 -0400
committerTony Luck <tony.luck@intel.com>2006-09-26 14:16:56 -0700
commit816add4e986499145135c4014a7c8a8857f9f3c3 (patch)
tree659155937ec49b48fa488a8b19a7cf347e1baa13
parent709a6c1c07673a9f7879b5f7306dc8d723db93a2 (diff)
downloadop-kernel-dev-816add4e986499145135c4014a7c8a8857f9f3c3.zip
op-kernel-dev-816add4e986499145135c4014a7c8a8857f9f3c3.tar.gz
[IA64] trim output of show_mem()
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>
-rw-r--r--arch/ia64/mm/discontig.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0ce2474..6ea2797 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -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);
OpenPOWER on IntegriCloud