diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 13:53:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 13:53:30 -0400 |
commit | cdb8355add9b1d87ecfcb58b12879897dc1e3e36 (patch) | |
tree | 9af61da194aaa6c255cf17de9e324c21a35581b3 /arch/ia64/mm/discontig.c | |
parent | b98adfccdf5f8dd34ae56a2d5adbe2c030bd4674 (diff) | |
parent | df8f0ec1a413ae610899f009e25dc9777881e149 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] minor reformatting to vmlinux.lds.S
[IA64] CMC/CPE: Reverse the order of fetching log and checking poll threshold
[IA64] PAL calls need physical mode, stacked
[IA64] ar.fpsr not set on MCA/INIT kernel entry
[IA64] printing support for MCA/INIT
[IA64] trim output of show_mem()
[IA64] show_mem() printk levels
[IA64] Make gp value point to Region 5 in mca handler
Revert "[IA64] Unwire set/get_robust_list"
[IA64] Implement futex primitives
[IA64-SGI] Do not request DMA memory for BTE
[IA64] Move perfmon tables from thread_struct to pfm_context
[IA64] Add interface so modules can discover whether multithreading is on.
[IA64] kprobes: fixup the pagefault exception caused by probehandlers
[IA64] kprobe opcode 16 bytes alignment on IA64
[IA64] esi-support
[IA64] Add "model name" to /proc/cpuinfo
Diffstat (limited to 'arch/ia64/mm/discontig.c')
-rw-r--r-- | arch/ia64/mm/discontig.c | 28 |
1 files changed, 14 insertions, 14 deletions
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 | /** |