Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / ia64 / mm / contig.c

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index fd103886bb0a9462e6b07abb5020d7b5b1521d84..1e79551231b91de2bdac6de77ef03b688c31434f 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -232,7 +232,6 @@ void __init
 paging_init (void)
 {
        unsigned long max_dma;
-       unsigned long nid = 0;
        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
        num_physpages = 0;
@@ -244,7 +243,7 @@ paging_init (void)
        max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
-       efi_memmap_walk(register_active_ranges, &nid);
+       efi_memmap_walk(register_active_ranges, NULL);
        efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
        if (max_gap < LARGE_GAP) {
                vmem_map = (struct page *) 0;