[IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid'

This warning only shows up with CONFIG_VIRTUAL_MEM_MAP=y and
CONFIG_FLATMEM=y.

There is only one caller left for register_active_ranges() from the
contig.c code ... so it doesn't need to pick up the node number, the
node number is always zero.

Signed-off-by: Tony Luck <tony.luck@intel.com>

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;

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 56dc2024220e424d2dd6e1d5de57c4c65e17a0e0..1a3d8a2feb947452226725e27901ffadfd7b345e 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -595,14 +595,9 @@ find_largest_hole (u64 start, u64 end, void *arg)
 }
 
 int __init
-register_active_ranges(u64 start, u64 end, void *nid)
+register_active_ranges(u64 start, u64 end, void *arg)
 {
-       BUG_ON(nid == NULL);
-       BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES);
-
-       add_active_range(*(unsigned long *)nid,
-                               __pa(start) >> PAGE_SHIFT,
-                               __pa(end) >> PAGE_SHIFT);
+       add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT);
        return 0;
 }
 #endif /* CONFIG_VIRTUAL_MEM_MAP */