From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Picco Date: Mon, 23 May 2005 17:50:57 +0000 Subject: [patch 2/4] ia64 SPARSEMEM - eliminate contig_page_data Message-Id: <20050523175057.GE2783@localhost.localdomain> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-ia64@vger.kernel.org For FLATMEM contig_page_data has been made transparent to the arch code. This patch conforms to that change. Signed-off-by: Bob Picco contig.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.12-rc4-mm2-broken/arch/ia64/mm/contig.c =================================--- linux-2.6.12-rc4-mm2-broken.orig/arch/ia64/mm/contig.c 2005-05-16 11:26:07.000000000 -0400 +++ linux-2.6.12-rc4-mm2-broken/arch/ia64/mm/contig.c 2005-05-18 12:44:33.000000000 -0400 @@ -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);