From: KAMEZAWA Hiroyuki Replace for_each_pgdat() with for_each_online_pgdat(). Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton --- arch/i386/mm/pgtable.c | 2 +- arch/ia64/mm/discontig.c | 4 ++-- arch/ia64/mm/init.c | 2 +- arch/m32r/mm/init.c | 2 +- arch/powerpc/mm/mem.c | 4 ++-- arch/x86_64/mm/init.c | 2 +- fs/buffer.c | 2 +- mm/page_alloc.c | 6 +++--- mm/vmscan.c | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) diff -puN arch/i386/mm/pgtable.c~for_each_online_pgdat-take2-renaming arch/i386/mm/pgtable.c --- devel/arch/i386/mm/pgtable.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/i386/mm/pgtable.c 2006-02-27 20:24:56.000000000 -0800 @@ -36,7 +36,7 @@ void show_mem(void) printk(KERN_INFO "Mem-info:\n"); show_free_areas(); printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { pgdat_resize_lock(pgdat, &flags); for (i = 0; i < pgdat->node_spanned_pages; ++i) { page = pgdat_page_nr(pgdat, i); diff -puN arch/ia64/mm/discontig.c~for_each_online_pgdat-take2-renaming arch/ia64/mm/discontig.c --- devel/arch/ia64/mm/discontig.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/ia64/mm/discontig.c 2006-02-27 20:24:56.000000000 -0800 @@ -386,7 +386,7 @@ static void __init pgdat_insert(pg_data_ { pg_data_t *prev = NULL, *next; - for_each_pgdat(next) + for_each_online_pgdat(next) if (pgdat->node_id < next->node_id) break; else @@ -560,7 +560,7 @@ void show_mem(void) printk("Mem-info:\n"); show_free_areas(); printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { unsigned long present; unsigned long flags; int shared = 0, cached = 0, reserved = 0; diff -puN arch/ia64/mm/init.c~for_each_online_pgdat-take2-renaming arch/ia64/mm/init.c --- devel/arch/ia64/mm/init.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/ia64/mm/init.c 2006-02-27 20:24:56.000000000 -0800 @@ -600,7 +600,7 @@ mem_init (void) kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START); kclist_add(&kcore_kernel, _stext, _end - _stext); - for_each_pgdat(pgdat) + for_each_online_pgdat(pgdat) if (pgdat->bdata->node_bootmem_map) totalram_pages += free_all_bootmem_node(pgdat); diff -puN arch/m32r/mm/init.c~for_each_online_pgdat-take2-renaming arch/m32r/mm/init.c --- devel/arch/m32r/mm/init.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/m32r/mm/init.c 2006-02-27 20:24:56.000000000 -0800 @@ -47,7 +47,7 @@ void show_mem(void) printk("Mem-info:\n"); show_free_areas(); printk("Free swap: %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10)); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { unsigned long flags; pgdat_resize_lock(pgdat, &flags); for (i = 0; i < pgdat->node_spanned_pages; ++i) { diff -puN arch/powerpc/mm/mem.c~for_each_online_pgdat-take2-renaming arch/powerpc/mm/mem.c --- devel/arch/powerpc/mm/mem.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/powerpc/mm/mem.c 2006-02-27 20:24:56.000000000 -0800 @@ -195,7 +195,7 @@ void show_mem(void) printk("Mem-info:\n"); show_free_areas(); printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { unsigned long flags; pgdat_resize_lock(pgdat, &flags); for (i = 0; i < pgdat->node_spanned_pages; i++) { @@ -351,7 +351,7 @@ void __init mem_init(void) max_mapnr = max_pfn; totalram_pages += free_all_bootmem(); #endif - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; i++) { if (!pfn_valid(pgdat->node_start_pfn + i)) continue; diff -puN arch/x86_64/mm/init.c~for_each_online_pgdat-take2-renaming arch/x86_64/mm/init.c --- devel/arch/x86_64/mm/init.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/arch/x86_64/mm/init.c 2006-02-27 20:24:56.000000000 -0800 @@ -72,7 +72,7 @@ void show_mem(void) show_free_areas(); printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; ++i) { page = pfn_to_page(pgdat->node_start_pfn + i); total++; diff -puN fs/buffer.c~for_each_online_pgdat-take2-renaming fs/buffer.c --- devel/fs/buffer.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/fs/buffer.c 2006-02-27 20:24:56.000000000 -0800 @@ -499,7 +499,7 @@ static void free_more_memory(void) wakeup_pdflush(1024); yield(); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { zones = pgdat->node_zonelists[gfp_zone(GFP_NOFS)].zones; if (*zones) try_to_free_pages(zones, GFP_NOFS); diff -puN mm/page_alloc.c~for_each_online_pgdat-take2-renaming mm/page_alloc.c --- devel/mm/page_alloc.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/mm/page_alloc.c 2006-02-27 20:24:56.000000000 -0800 @@ -1197,7 +1197,7 @@ unsigned int nr_free_highpages (void) pg_data_t *pgdat; unsigned int pages = 0; - for_each_pgdat(pgdat) + for_each_online_pgdat(pgdat) pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages; return pages; @@ -1341,7 +1341,7 @@ void get_zone_counts(unsigned long *acti *active = 0; *inactive = 0; *free = 0; - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { unsigned long l, m, n; __get_zone_counts(&l, &m, &n, pgdat); *active += l; @@ -2479,7 +2479,7 @@ static void setup_per_zone_lowmem_reserv struct pglist_data *pgdat; int j, idx; - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { for (j = 0; j < MAX_NR_ZONES; j++) { struct zone *zone = pgdat->node_zones + j; unsigned long present_pages = zone->present_pages; diff -puN mm/vmscan.c~for_each_online_pgdat-take2-renaming mm/vmscan.c --- devel/mm/vmscan.c~for_each_online_pgdat-take2-renaming 2006-02-27 20:24:56.000000000 -0800 +++ devel-akpm/mm/vmscan.c 2006-02-27 20:25:11.000000000 -0800 @@ -1796,7 +1796,7 @@ unsigned long shrink_all_memory(unsigned current->reclaim_state = &reclaim_state; repeat: - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { unsigned long freed; freed = balance_pgdat(pgdat, nr_to_free, 0); @@ -1826,7 +1826,7 @@ static int __devinit cpu_callback(struct cpumask_t mask; if (action == CPU_ONLINE) { - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { mask = node_to_cpumask(pgdat->node_id); if (any_online_cpu(mask) != NR_CPUS) /* One of our CPUs online: restore mask */ @@ -1842,7 +1842,7 @@ static int __init kswapd_init(void) pg_data_t *pgdat; swap_setup(); - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { pid_t pid; pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL); _