diff options
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r-- | arch/ia64/mm/contig.c | 17 | ||||
-rw-r--r-- | arch/ia64/mm/discontig.c | 28 |
2 files changed, 23 insertions, 22 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 719d476e71ba..daf977ff2920 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -40,10 +40,11 @@ show_mem (void) | |||
40 | int i, total = 0, reserved = 0; | 40 | int i, total = 0, reserved = 0; |
41 | int shared = 0, cached = 0; | 41 | int shared = 0, cached = 0; |
42 | 42 | ||
43 | printk("Mem-info:\n"); | 43 | printk(KERN_INFO "Mem-info:\n"); |
44 | show_free_areas(); | 44 | show_free_areas(); |
45 | 45 | ||
46 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 46 | printk(KERN_INFO "Free swap: %6ldkB\n", |
47 | nr_swap_pages<<(PAGE_SHIFT-10)); | ||
47 | i = max_mapnr; | 48 | i = max_mapnr; |
48 | for (i = 0; i < max_mapnr; i++) { | 49 | for (i = 0; i < max_mapnr; i++) { |
49 | if (!pfn_valid(i)) { | 50 | if (!pfn_valid(i)) { |
@@ -62,12 +63,12 @@ show_mem (void) | |||
62 | else if (page_count(mem_map + i)) | 63 | else if (page_count(mem_map + i)) |
63 | shared += page_count(mem_map + i) - 1; | 64 | shared += page_count(mem_map + i) - 1; |
64 | } | 65 | } |
65 | printk("%d pages of RAM\n", total); | 66 | printk(KERN_INFO "%d pages of RAM\n", total); |
66 | printk("%d reserved pages\n", reserved); | 67 | printk(KERN_INFO "%d reserved pages\n", reserved); |
67 | printk("%d pages shared\n", shared); | 68 | printk(KERN_INFO "%d pages shared\n", shared); |
68 | printk("%d pages swap cached\n", cached); | 69 | printk(KERN_INFO "%d pages swap cached\n", cached); |
69 | printk("%ld pages in page table cache\n", | 70 | printk(KERN_INFO "%ld pages in page table cache\n", |
70 | pgtable_quicklist_total_size()); | 71 | pgtable_quicklist_total_size()); |
71 | } | 72 | } |
72 | 73 | ||
73 | /* physical address where the bootmem map is located */ | 74 | /* physical address where the bootmem map is located */ |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 7bd28079dcc4..d497b6b0f5b2 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -547,15 +547,16 @@ void show_mem(void) | |||
547 | unsigned long total_present = 0; | 547 | unsigned long total_present = 0; |
548 | pg_data_t *pgdat; | 548 | pg_data_t *pgdat; |
549 | 549 | ||
550 | printk("Mem-info:\n"); | 550 | printk(KERN_INFO "Mem-info:\n"); |
551 | show_free_areas(); | 551 | show_free_areas(); |
552 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 552 | printk(KERN_INFO "Free swap: %6ldkB\n", |
553 | nr_swap_pages<<(PAGE_SHIFT-10)); | ||
554 | printk(KERN_INFO "Node memory in pages:\n"); | ||
553 | for_each_online_pgdat(pgdat) { | 555 | for_each_online_pgdat(pgdat) { |
554 | unsigned long present; | 556 | unsigned long present; |
555 | unsigned long flags; | 557 | unsigned long flags; |
556 | int shared = 0, cached = 0, reserved = 0; | 558 | int shared = 0, cached = 0, reserved = 0; |
557 | 559 | ||
558 | printk("Node ID: %d\n", pgdat->node_id); | ||
559 | pgdat_resize_lock(pgdat, &flags); | 560 | pgdat_resize_lock(pgdat, &flags); |
560 | present = pgdat->node_present_pages; | 561 | present = pgdat->node_present_pages; |
561 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 562 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
@@ -579,18 +580,17 @@ void show_mem(void) | |||
579 | total_reserved += reserved; | 580 | total_reserved += reserved; |
580 | total_cached += cached; | 581 | total_cached += cached; |
581 | total_shared += shared; | 582 | total_shared += shared; |
582 | printk("\t%ld pages of RAM\n", present); | 583 | printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, " |
583 | printk("\t%d reserved pages\n", reserved); | 584 | "shrd: %10d, swpd: %10d\n", pgdat->node_id, |
584 | printk("\t%d pages shared\n", shared); | 585 | present, reserved, shared, cached); |
585 | printk("\t%d pages swap cached\n", cached); | ||
586 | } | 586 | } |
587 | printk("%ld pages of RAM\n", total_present); | 587 | printk(KERN_INFO "%ld pages of RAM\n", total_present); |
588 | printk("%d reserved pages\n", total_reserved); | 588 | printk(KERN_INFO "%d reserved pages\n", total_reserved); |
589 | printk("%d pages shared\n", total_shared); | 589 | printk(KERN_INFO "%d pages shared\n", total_shared); |
590 | printk("%d pages swap cached\n", total_cached); | 590 | printk(KERN_INFO "%d pages swap cached\n", total_cached); |
591 | printk("Total of %ld pages in page table cache\n", | 591 | printk(KERN_INFO "Total of %ld pages in page table cache\n", |
592 | pgtable_quicklist_total_size()); | 592 | pgtable_quicklist_total_size()); |
593 | printk("%d free buffer pages\n", nr_free_buffer_pages()); | 593 | printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages()); |
594 | } | 594 | } |
595 | 595 | ||
596 | /** | 596 | /** |