From: Matthew Dobson 1/10 - Replace numnodes with node_online_map for alpha [mcd@arrakis node_online_map]$ diffstat arch-alpha.patch -Matt Signed-off-by: Andrew Morton --- 25-akpm/arch/alpha/mm/numa.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/alpha/mm/numa.c~replace-numnodes-with-node_online_map-alpha arch/alpha/mm/numa.c --- 25/arch/alpha/mm/numa.c~replace-numnodes-with-node_online_map-alpha Thu Dec 23 15:21:52 2004 +++ 25-akpm/arch/alpha/mm/numa.c Thu Dec 23 15:21:52 2004 @@ -246,7 +246,7 @@ setup_memory_node(int nid, void *kernel_ reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start), bootmap_size); printk(" reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size)); - numnodes++; + node_set_online(nid); } void __init @@ -256,7 +256,7 @@ setup_memory(void *kernel_end) show_mem_layout(); - numnodes = 0; + nodes_clear(node_online_map); min_low_pfn = ~0UL; max_low_pfn = 0UL; @@ -303,7 +303,7 @@ void __init paging_init(void) */ dma_local_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; - for (nid = 0; nid < numnodes; nid++) { + for_each_online_node(nid) { unsigned long start_pfn = node_bdata[nid].node_boot_start >> PAGE_SHIFT; unsigned long end_pfn = node_bdata[nid].node_low_pfn; @@ -332,7 +332,7 @@ void __init mem_init(void) high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); reservedpages = 0; - for (nid = 0; nid < numnodes; nid++) { + for_each_online_node(nid) { /* * This will free up the bootmem, ie, slot 0 memory */ @@ -372,7 +372,7 @@ show_mem(void) printk("\nMem-info:\n"); show_free_areas(); printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); - for (nid = 0; nid < numnodes; nid++) { + for_each_online_node(nid) { struct page * lmem_map = node_mem_map(nid); i = node_spanned_pages(nid); while (i-- > 0) { _