aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/init.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-12-12 14:18:55 -0500
committerTony Luck <tony.luck@intel.com>2006-12-12 14:18:55 -0500
commit8b9c106856d92c8266697328b148d115538b59ce (patch)
treea8c68bb48290d97ae942ca63efeb94856fb892ae /arch/ia64/mm/init.c
parentf889a26a703b03c774849685583cec7746738f3c (diff)
[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>
Diffstat (limited to 'arch/ia64/mm/init.c')
-rw-r--r--arch/ia64/mm/init.c9
1 files changed, 2 insertions, 7 deletions
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
597int __init 597int __init
598register_active_ranges(u64 start, u64 end, void *nid) 598register_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 */