upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / ia64 / mm / contig.c

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index d79be8e..f1fa999 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -25,6 +25,7 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/sections.h>
+#include <asm/mca.h>
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 static unsigned long num_dma_physpages;
@@ -61,7 +62,8 @@ show_mem (void)
        printk("%d reserved pages\n", reserved);
        printk("%d pages shared\n", shared);
        printk("%d pages swap cached\n", cached);
-       printk("%ld pages in page table cache\n", pgtable_cache_size);
+       printk("%ld pages in page table cache\n",
+               pgtable_quicklist_total_size());
 }
 
 EXPORT_SYMBOL_GPL(show_mem);
@@ -217,8 +219,8 @@ count_dma_pages (u64 start, u64 end, void *arg)
 {
        unsigned long *count = arg;
 
-       if (end <= MAX_DMA_ADDRESS)
-               *count += (end - start) >> PAGE_SHIFT;
+       if (start < MAX_DMA_ADDRESS)
+               *count += (min(end, MAX_DMA_ADDRESS) - start) >> PAGE_SHIFT;
        return 0;
 }
 #endif
@@ -282,7 +284,7 @@ paging_init (void)
                vmem_map = (struct page *) vmalloc_end;
                efi_memmap_walk(create_mem_map_page_table, NULL);
 
-               mem_map = contig_page_data.node_mem_map = vmem_map;
+               NODE_DATA(0)->node_mem_map = vmem_map;
                free_area_init_node(0, &contig_page_data, zones_size,
                                    0, zholes_size);