diff options
Diffstat (limited to 'arch/ia64/mm/contig.c')
| -rw-r--r-- | arch/ia64/mm/contig.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 9a018cde5d8..f114a3b14c6 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
| @@ -44,13 +44,16 @@ void show_mem(unsigned int filter) | |||
| 44 | pg_data_t *pgdat; | 44 | pg_data_t *pgdat; |
| 45 | 45 | ||
| 46 | printk(KERN_INFO "Mem-info:\n"); | 46 | printk(KERN_INFO "Mem-info:\n"); |
| 47 | show_free_areas(); | 47 | show_free_areas(filter); |
| 48 | printk(KERN_INFO "Node memory in pages:\n"); | 48 | printk(KERN_INFO "Node memory in pages:\n"); |
| 49 | for_each_online_pgdat(pgdat) { | 49 | for_each_online_pgdat(pgdat) { |
| 50 | unsigned long present; | 50 | unsigned long present; |
| 51 | unsigned long flags; | 51 | unsigned long flags; |
| 52 | int shared = 0, cached = 0, reserved = 0; | 52 | int shared = 0, cached = 0, reserved = 0; |
| 53 | int nid = pgdat->node_id; | ||
| 53 | 54 | ||
| 55 | if (skip_free_areas_node(filter, nid)) | ||
| 56 | continue; | ||
| 54 | pgdat_resize_lock(pgdat, &flags); | 57 | pgdat_resize_lock(pgdat, &flags); |
| 55 | present = pgdat->node_present_pages; | 58 | present = pgdat->node_present_pages; |
| 56 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 59 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
| @@ -64,8 +67,7 @@ void show_mem(unsigned int filter) | |||
| 64 | if (max_gap < LARGE_GAP) | 67 | if (max_gap < LARGE_GAP) |
| 65 | continue; | 68 | continue; |
| 66 | #endif | 69 | #endif |
| 67 | i = vmemmap_find_next_valid_pfn(pgdat->node_id, | 70 | i = vmemmap_find_next_valid_pfn(nid, i) - 1; |
| 68 | i) - 1; | ||
| 69 | continue; | 71 | continue; |
| 70 | } | 72 | } |
| 71 | if (PageReserved(page)) | 73 | if (PageReserved(page)) |
| @@ -81,7 +83,7 @@ void show_mem(unsigned int filter) | |||
| 81 | total_cached += cached; | 83 | total_cached += cached; |
| 82 | total_shared += shared; | 84 | total_shared += shared; |
| 83 | printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, " | 85 | printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, " |
| 84 | "shrd: %10d, swpd: %10d\n", pgdat->node_id, | 86 | "shrd: %10d, swpd: %10d\n", nid, |
| 85 | present, reserved, shared, cached); | 87 | present, reserved, shared, cached); |
| 86 | } | 88 | } |
| 87 | printk(KERN_INFO "%ld pages of RAM\n", total_present); | 89 | printk(KERN_INFO "%ld pages of RAM\n", total_present); |
