diff options
Diffstat (limited to 'arch/ia64/mm/discontig.c')
| -rw-r--r-- | arch/ia64/mm/discontig.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index c2e955ee79a..ae4db4bd6d9 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -623,6 +623,8 @@ void show_mem(unsigned int filter)  	printk(KERN_INFO "Mem-info:\n");  	show_free_areas(filter); +	if (filter & SHOW_MEM_FILTER_PAGE_COUNT) +		return;  	printk(KERN_INFO "Node memory in pages:\n");  	for_each_online_pgdat(pgdat) {  		unsigned long present; @@ -817,13 +819,12 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)  #endif  #ifdef CONFIG_SPARSEMEM_VMEMMAP -int __meminit vmemmap_populate(struct page *start_page, -						unsigned long size, int node) +int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)  { -	return vmemmap_populate_basepages(start_page, size, node); +	return vmemmap_populate_basepages(start, end, node);  } -void vmemmap_free(struct page *memmap, unsigned long nr_pages) +void vmemmap_free(unsigned long start, unsigned long end)  {  }  #endif  |