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)  	pg_data_t *pgdat;  	printk(KERN_INFO "Mem-info:\n"); -	show_free_areas(); +	show_free_areas(filter);  	printk(KERN_INFO "Node memory in pages:\n");  	for_each_online_pgdat(pgdat) {  		unsigned long present;  		unsigned long flags;  		int shared = 0, cached = 0, reserved = 0; +		int nid = pgdat->node_id; +		if (skip_free_areas_node(filter, nid)) +			continue;  		pgdat_resize_lock(pgdat, &flags);  		present = pgdat->node_present_pages;  		for(i = 0; i < pgdat->node_spanned_pages; i++) { @@ -64,8 +67,7 @@ void show_mem(unsigned int filter)  				if (max_gap < LARGE_GAP)  					continue;  #endif -				i = vmemmap_find_next_valid_pfn(pgdat->node_id, -					 i) - 1; +				i = vmemmap_find_next_valid_pfn(nid, i) - 1;  				continue;  			}  			if (PageReserved(page)) @@ -81,7 +83,7 @@ void show_mem(unsigned int filter)  		total_cached += cached;  		total_shared += shared;  		printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, " -		       "shrd: %10d, swpd: %10d\n", pgdat->node_id, +		       "shrd: %10d, swpd: %10d\n", nid,  		       present, reserved, shared, cached);  	}  	printk(KERN_INFO "%ld pages of RAM\n", total_present);  |