lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Tony Luck
2006-12-12 11:18:55 -08:00
parent f889a26a70
commit 8b9c106856
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/mm/contig.c
View File

@@ -232,7 +232,6 @@ void __init
paging_init (void) paging_init (void)
{ {
unsigned long max_dma; unsigned long max_dma;
unsigned long nid = 0;
unsigned long max_zone_pfns[MAX_NR_ZONES]; unsigned long max_zone_pfns[MAX_NR_ZONES];
num_physpages = 0; num_physpages = 0;
@@ -244,7 +243,7 @@ paging_init (void)
max_zone_pfns[ZONE_NORMAL] = max_low_pfn; max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
#ifdef CONFIG_VIRTUAL_MEM_MAP #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); efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
if (max_gap < LARGE_GAP) { if (max_gap < LARGE_GAP) {
vmem_map = (struct page *) 0; vmem_map = (struct page *) 0;

9
arch/ia64/mm/init.c
View File

@@ -595,14 +595,9 @@ find_largest_hole (u64 start, u64 end, void *arg)
} }
int __init int __init
register_active_ranges(u64 start, u64 end, void *nid) register_active_ranges(u64 start, u64 end, void *arg)
{ {
BUG_ON(nid == NULL); add_active_range(0, __pa(start) >> PAGE_SHIFT, __pa(end) >> PAGE_SHIFT);
BUG_ON(*(unsigned long *)nid >= MAX_NUMNODES);
add_active_range(*(unsigned long *)nid,
__pa(start) >> PAGE_SHIFT,
__pa(end) >> PAGE_SHIFT);
return 0; return 0;
} }
#endif /* CONFIG_VIRTUAL_MEM_MAP */ #endif /* CONFIG_VIRTUAL_MEM_MAP */