diff options
author | Jes Sorensen <jes@sgi.com> | 2006-09-14 07:10:30 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-09-26 17:16:56 -0400 |
commit | 816add4e986499145135c4014a7c8a8857f9f3c3 (patch) | |
tree | 659155937ec49b48fa488a8b19a7cf347e1baa13 | |
parent | 709a6c1c07673a9f7879b5f7306dc8d723db93a2 (diff) |
[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.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 0ce247444f21..6ea279766334 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -551,12 +551,12 @@ void show_mem(void) | |||
551 | show_free_areas(); | 551 | show_free_areas(); |
552 | printk(KERN_INFO "Free swap: %6ldkB\n", | 552 | printk(KERN_INFO "Free swap: %6ldkB\n", |
553 | nr_swap_pages<<(PAGE_SHIFT-10)); | 553 | nr_swap_pages<<(PAGE_SHIFT-10)); |
554 | printk(KERN_INFO "Node memory in pages:\n"); | ||
554 | for_each_online_pgdat(pgdat) { | 555 | for_each_online_pgdat(pgdat) { |
555 | unsigned long present; | 556 | unsigned long present; |
556 | unsigned long flags; | 557 | unsigned long flags; |
557 | int shared = 0, cached = 0, reserved = 0; | 558 | int shared = 0, cached = 0, reserved = 0; |
558 | 559 | ||
559 | printk(KERN_INFO "Node ID: %d\n", pgdat->node_id); | ||
560 | pgdat_resize_lock(pgdat, &flags); | 560 | pgdat_resize_lock(pgdat, &flags); |
561 | present = pgdat->node_present_pages; | 561 | present = pgdat->node_present_pages; |
562 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 562 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
@@ -580,10 +580,9 @@ void show_mem(void) | |||
580 | total_reserved += reserved; | 580 | total_reserved += reserved; |
581 | total_cached += cached; | 581 | total_cached += cached; |
582 | total_shared += shared; | 582 | total_shared += shared; |
583 | printk(KERN_INFO "\t%ld pages of RAM\n", present); | 583 | printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, " |
584 | printk(KERN_INFO "\t%d reserved pages\n", reserved); | 584 | "shrd: %10d, swpd: %10d\n", pgdat->node_id, |
585 | printk(KERN_INFO "\t%d pages shared\n", shared); | 585 | present, reserved, shared, cached); |
586 | printk(KERN_INFO "\t%d pages swap cached\n", cached); | ||
587 | } | 586 | } |
588 | printk(KERN_INFO "%ld pages of RAM\n", total_present); | 587 | printk(KERN_INFO "%ld pages of RAM\n", total_present); |
589 | printk(KERN_INFO "%d reserved pages\n", total_reserved); | 588 | printk(KERN_INFO "%d reserved pages\n", total_reserved); |