aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-09-13 08:43:42 -0400
committerTony Luck <tony.luck@intel.com>2006-09-26 17:15:54 -0400
commit709a6c1c07673a9f7879b5f7306dc8d723db93a2 (patch)
tree9703e9652852bad1aa55bba3ba91b22fcd710c25 /arch
parentf5a3f3dc189485d607fbd42678cc23958acc0a6e (diff)
[IA64] show_mem() printk levels
Use the default sysrq printk level for printing show_mem() output both for disconfig and contig versions. This is consistent with the printk level used on other architectures (well ia32 at least). Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/mm/contig.c17
-rw-r--r--arch/ia64/mm/discontig.c29
2 files changed, 24 insertions, 22 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index e004143ba86b..537c2f3833ee 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -41,10 +41,11 @@ show_mem (void)
41 int i, total = 0, reserved = 0; 41 int i, total = 0, reserved = 0;
42 int shared = 0, cached = 0; 42 int shared = 0, cached = 0;
43 43
44 printk("Mem-info:\n"); 44 printk(KERN_INFO "Mem-info:\n");
45 show_free_areas(); 45 show_free_areas();
46 46
47 printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); 47 printk(KERN_INFO "Free swap: %6ldkB\n",
48 nr_swap_pages<<(PAGE_SHIFT-10));
48 i = max_mapnr; 49 i = max_mapnr;
49 for (i = 0; i < max_mapnr; i++) { 50 for (i = 0; i < max_mapnr; i++) {
50 if (!pfn_valid(i)) { 51 if (!pfn_valid(i)) {
@@ -63,12 +64,12 @@ show_mem (void)
63 else if (page_count(mem_map + i)) 64 else if (page_count(mem_map + i))
64 shared += page_count(mem_map + i) - 1; 65 shared += page_count(mem_map + i) - 1;
65 } 66 }
66 printk("%d pages of RAM\n", total); 67 printk(KERN_INFO "%d pages of RAM\n", total);
67 printk("%d reserved pages\n", reserved); 68 printk(KERN_INFO "%d reserved pages\n", reserved);
68 printk("%d pages shared\n", shared); 69 printk(KERN_INFO "%d pages shared\n", shared);
69 printk("%d pages swap cached\n", cached); 70 printk(KERN_INFO "%d pages swap cached\n", cached);
70 printk("%ld pages in page table cache\n", 71 printk(KERN_INFO "%ld pages in page table cache\n",
71 pgtable_quicklist_total_size()); 72 pgtable_quicklist_total_size());
72} 73}
73 74
74/* physical address where the bootmem map is located */ 75/* physical address where the bootmem map is located */
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index d260bffa01ab..0ce247444f21 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));
553 for_each_online_pgdat(pgdat) { 554 for_each_online_pgdat(pgdat) {
554 unsigned long present; 555 unsigned long present;
555 unsigned long flags; 556 unsigned long flags;
556 int shared = 0, cached = 0, reserved = 0; 557 int shared = 0, cached = 0, reserved = 0;
557 558
558 printk("Node ID: %d\n", pgdat->node_id); 559 printk(KERN_INFO "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,18 @@ 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 "\t%ld pages of RAM\n", present);
583 printk("\t%d reserved pages\n", reserved); 584 printk(KERN_INFO "\t%d reserved pages\n", reserved);
584 printk("\t%d pages shared\n", shared); 585 printk(KERN_INFO "\t%d pages shared\n", shared);
585 printk("\t%d pages swap cached\n", cached); 586 printk(KERN_INFO "\t%d pages swap cached\n", cached);
586 } 587 }
587 printk("%ld pages of RAM\n", total_present); 588 printk(KERN_INFO "%ld pages of RAM\n", total_present);
588 printk("%d reserved pages\n", total_reserved); 589 printk(KERN_INFO "%d reserved pages\n", total_reserved);
589 printk("%d pages shared\n", total_shared); 590 printk(KERN_INFO "%d pages shared\n", total_shared);
590 printk("%d pages swap cached\n", total_cached); 591 printk(KERN_INFO "%d pages swap cached\n", total_cached);
591 printk("Total of %ld pages in page table cache\n", 592 printk(KERN_INFO "Total of %ld pages in page table cache\n",
592 pgtable_quicklist_total_size()); 593 pgtable_quicklist_total_size());
593 printk("%d free buffer pages\n", nr_free_buffer_pages()); 594 printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
594} 595}
595 596
596/** 597/**