diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/mm/contig.c | 3 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index fd103886bb0a..1e79551231b9 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -232,7 +232,6 @@ void __init | |||
232 | paging_init (void) | 232 | paging_init (void) |
233 | { | 233 | { |
234 | unsigned long max_dma; | 234 | unsigned long max_dma; |
235 | unsigned long nid = 0; | ||
236 | unsigned long max_zone_pfns[MAX_NR_ZONES]; | 235 | unsigned long max_zone_pfns[MAX_NR_ZONES]; |
237 | 236 | ||
238 | num_physpages = 0; | 237 | num_physpages = 0; |
@@ -244,7 +243,7 @@ paging_init (void) | |||
244 | max_zone_pfns[ZONE_NORMAL] = max_low_pfn; | 243 | max_zone_pfns[ZONE_NORMAL] = max_low_pfn; |
245 | 244 | ||
246 | #ifdef CONFIG_VIRTUAL_MEM_MAP | 245 | #ifdef CONFIG_VIRTUAL_MEM_MAP |
247 | efi_memmap_walk(register_active_ranges, &nid); | 246 | efi_memmap_walk(register_active_ranges, NULL); |
248 | efi_memmap_walk(find_largest_hole, (u64 *)&max_gap); | 247 | efi_memmap_walk(find_largest_hole, (u64 *)&max_gap); |
249 | if (max_gap < LARGE_GAP) { | 248 | if (max_gap < LARGE_GAP) { |
250 | vmem_map = (struct page *) 0; | 249 | vmem_map = (struct page *) 0; |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 56dc2024220e..1a3d8a2feb94 100644 --- 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) | |||
595 | } | 595 | } |
596 | 596 | ||
597 | int __init | 597 | int __init |
598 | register_active_ranges(u64 start, u64 end, void *nid) | 598 | register_active_ranges(u64 start, u64 end, void *arg) |
599 | { | 599 | { |
600 | BUG_ON(nid == NULL); | 600 | add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT); |
601 | BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES); | ||
602 | |||
603 | add_active_range(*(unsigned long *)nid, | ||
604 | __pa(start) >> PAGE_SHIFT, | ||
605 | __pa(end) >> PAGE_SHIFT); | ||
606 | return 0; | 601 | return 0; |
607 | } | 602 | } |
608 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ | 603 | #endif /* CONFIG_VIRTUAL_MEM_MAP */ |