Merge ../linux-2.6 by hand

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 91a055f5731f..acaaec4e4681 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -269,7 +269,7 @@ paging_init (void)
         efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
         if (max_gap < LARGE_GAP) {
                 vmem_map = (struct page *) 0;
-                free_area_init_node(0, &contig_page_data, zones_size, 0,
+                free_area_init_node(0, NODE_DATA(0), zones_size, 0,
                                     zholes_size);
         } else {
                 unsigned long map_size;
@@ -282,7 +282,7 @@ paging_init (void)
                 efi_memmap_walk(create_mem_map_page_table, NULL);
 
                 NODE_DATA(0)->node_mem_map = vmem_map;
-                free_area_init_node(0, &contig_page_data, zones_size,
+                free_area_init_node(0, NODE_DATA(0), zones_size,
                                     0, zholes_size);
 
                 printk("Virtual mem_map starts at 0x%p\n", mem_map);