diff options
-rw-r--r-- | arch/i386/mm/pgtable.c | 2 | ||||
-rw-r--r-- | arch/ia64/mm/discontig.c | 4 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 2 | ||||
-rw-r--r-- | arch/m32r/mm/init.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/mem.c | 4 | ||||
-rw-r--r-- | arch/x86_64/mm/init.c | 2 | ||||
-rw-r--r-- | fs/buffer.c | 2 | ||||
-rw-r--r-- | mm/page_alloc.c | 6 | ||||
-rw-r--r-- | mm/vmscan.c | 6 |
9 files changed, 15 insertions, 15 deletions
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c index 9db3242103be..2889567e21a1 100644 --- a/arch/i386/mm/pgtable.c +++ b/arch/i386/mm/pgtable.c | |||
@@ -36,7 +36,7 @@ void show_mem(void) | |||
36 | printk(KERN_INFO "Mem-info:\n"); | 36 | printk(KERN_INFO "Mem-info:\n"); |
37 | show_free_areas(); | 37 | show_free_areas(); |
38 | printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 38 | printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); |
39 | for_each_pgdat(pgdat) { | 39 | for_each_online_pgdat(pgdat) { |
40 | pgdat_resize_lock(pgdat, &flags); | 40 | pgdat_resize_lock(pgdat, &flags); |
41 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { | 41 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { |
42 | page = pgdat_page_nr(pgdat, i); | 42 | page = pgdat_page_nr(pgdat, i); |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 2f5e44862e91..384f1d7dce96 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -386,7 +386,7 @@ static void __init pgdat_insert(pg_data_t *pgdat) | |||
386 | { | 386 | { |
387 | pg_data_t *prev = NULL, *next; | 387 | pg_data_t *prev = NULL, *next; |
388 | 388 | ||
389 | for_each_pgdat(next) | 389 | for_each_online_pgdat(next) |
390 | if (pgdat->node_id < next->node_id) | 390 | if (pgdat->node_id < next->node_id) |
391 | break; | 391 | break; |
392 | else | 392 | else |
@@ -560,7 +560,7 @@ void show_mem(void) | |||
560 | printk("Mem-info:\n"); | 560 | printk("Mem-info:\n"); |
561 | show_free_areas(); | 561 | show_free_areas(); |
562 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 562 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); |
563 | for_each_pgdat(pgdat) { | 563 | for_each_online_pgdat(pgdat) { |
564 | unsigned long present; | 564 | unsigned long present; |
565 | unsigned long flags; | 565 | unsigned long flags; |
566 | int shared = 0, cached = 0, reserved = 0; | 566 | int shared = 0, cached = 0, reserved = 0; |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index ff4f31fcd330..2ef1151cde90 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -600,7 +600,7 @@ mem_init (void) | |||
600 | kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START); | 600 | kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START); |
601 | kclist_add(&kcore_kernel, _stext, _end - _stext); | 601 | kclist_add(&kcore_kernel, _stext, _end - _stext); |
602 | 602 | ||
603 | for_each_pgdat(pgdat) | 603 | for_each_online_pgdat(pgdat) |
604 | if (pgdat->bdata->node_bootmem_map) | 604 | if (pgdat->bdata->node_bootmem_map) |
605 | totalram_pages += free_all_bootmem_node(pgdat); | 605 | totalram_pages += free_all_bootmem_node(pgdat); |
606 | 606 | ||
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index c9e7dad860b7..2e0fe199ce38 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
@@ -47,7 +47,7 @@ void show_mem(void) | |||
47 | printk("Mem-info:\n"); | 47 | printk("Mem-info:\n"); |
48 | show_free_areas(); | 48 | show_free_areas(); |
49 | printk("Free swap: %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10)); | 49 | printk("Free swap: %6ldkB\n",nr_swap_pages<<(PAGE_SHIFT-10)); |
50 | for_each_pgdat(pgdat) { | 50 | for_each_online_pgdat(pgdat) { |
51 | unsigned long flags; | 51 | unsigned long flags; |
52 | pgdat_resize_lock(pgdat, &flags); | 52 | pgdat_resize_lock(pgdat, &flags); |
53 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { | 53 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index badac10d700c..5e435a9c3431 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -195,7 +195,7 @@ void show_mem(void) | |||
195 | printk("Mem-info:\n"); | 195 | printk("Mem-info:\n"); |
196 | show_free_areas(); | 196 | show_free_areas(); |
197 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 197 | printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); |
198 | for_each_pgdat(pgdat) { | 198 | for_each_online_pgdat(pgdat) { |
199 | unsigned long flags; | 199 | unsigned long flags; |
200 | pgdat_resize_lock(pgdat, &flags); | 200 | pgdat_resize_lock(pgdat, &flags); |
201 | for (i = 0; i < pgdat->node_spanned_pages; i++) { | 201 | for (i = 0; i < pgdat->node_spanned_pages; i++) { |
@@ -351,7 +351,7 @@ void __init mem_init(void) | |||
351 | max_mapnr = max_pfn; | 351 | max_mapnr = max_pfn; |
352 | totalram_pages += free_all_bootmem(); | 352 | totalram_pages += free_all_bootmem(); |
353 | #endif | 353 | #endif |
354 | for_each_pgdat(pgdat) { | 354 | for_each_online_pgdat(pgdat) { |
355 | for (i = 0; i < pgdat->node_spanned_pages; i++) { | 355 | for (i = 0; i < pgdat->node_spanned_pages; i++) { |
356 | if (!pfn_valid(pgdat->node_start_pfn + i)) | 356 | if (!pfn_valid(pgdat->node_start_pfn + i)) |
357 | continue; | 357 | continue; |
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index b04415625442..e5f7f1c34462 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c | |||
@@ -72,7 +72,7 @@ void show_mem(void) | |||
72 | show_free_areas(); | 72 | show_free_areas(); |
73 | printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); | 73 | printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10)); |
74 | 74 | ||
75 | for_each_pgdat(pgdat) { | 75 | for_each_online_pgdat(pgdat) { |
76 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { | 76 | for (i = 0; i < pgdat->node_spanned_pages; ++i) { |
77 | page = pfn_to_page(pgdat->node_start_pfn + i); | 77 | page = pfn_to_page(pgdat->node_start_pfn + i); |
78 | total++; | 78 | total++; |
diff --git a/fs/buffer.c b/fs/buffer.c index d597758dd129..23f1f3a68077 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -493,7 +493,7 @@ static void free_more_memory(void) | |||
493 | wakeup_pdflush(1024); | 493 | wakeup_pdflush(1024); |
494 | yield(); | 494 | yield(); |
495 | 495 | ||
496 | for_each_pgdat(pgdat) { | 496 | for_each_online_pgdat(pgdat) { |
497 | zones = pgdat->node_zonelists[gfp_zone(GFP_NOFS)].zones; | 497 | zones = pgdat->node_zonelists[gfp_zone(GFP_NOFS)].zones; |
498 | if (*zones) | 498 | if (*zones) |
499 | try_to_free_pages(zones, GFP_NOFS); | 499 | try_to_free_pages(zones, GFP_NOFS); |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8dc8f2735d22..ccc3713dd407 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1201,7 +1201,7 @@ unsigned int nr_free_highpages (void) | |||
1201 | pg_data_t *pgdat; | 1201 | pg_data_t *pgdat; |
1202 | unsigned int pages = 0; | 1202 | unsigned int pages = 0; |
1203 | 1203 | ||
1204 | for_each_pgdat(pgdat) | 1204 | for_each_online_pgdat(pgdat) |
1205 | pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages; | 1205 | pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages; |
1206 | 1206 | ||
1207 | return pages; | 1207 | return pages; |
@@ -1343,7 +1343,7 @@ void get_zone_counts(unsigned long *active, | |||
1343 | *active = 0; | 1343 | *active = 0; |
1344 | *inactive = 0; | 1344 | *inactive = 0; |
1345 | *free = 0; | 1345 | *free = 0; |
1346 | for_each_pgdat(pgdat) { | 1346 | for_each_online_pgdat(pgdat) { |
1347 | unsigned long l, m, n; | 1347 | unsigned long l, m, n; |
1348 | __get_zone_counts(&l, &m, &n, pgdat); | 1348 | __get_zone_counts(&l, &m, &n, pgdat); |
1349 | *active += l; | 1349 | *active += l; |
@@ -2482,7 +2482,7 @@ static void setup_per_zone_lowmem_reserve(void) | |||
2482 | struct pglist_data *pgdat; | 2482 | struct pglist_data *pgdat; |
2483 | int j, idx; | 2483 | int j, idx; |
2484 | 2484 | ||
2485 | for_each_pgdat(pgdat) { | 2485 | for_each_online_pgdat(pgdat) { |
2486 | for (j = 0; j < MAX_NR_ZONES; j++) { | 2486 | for (j = 0; j < MAX_NR_ZONES; j++) { |
2487 | struct zone *zone = pgdat->node_zones + j; | 2487 | struct zone *zone = pgdat->node_zones + j; |
2488 | unsigned long present_pages = zone->present_pages; | 2488 | unsigned long present_pages = zone->present_pages; |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 78865c849f8f..acdf001d6941 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1305,7 +1305,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) | |||
1305 | 1305 | ||
1306 | current->reclaim_state = &reclaim_state; | 1306 | current->reclaim_state = &reclaim_state; |
1307 | repeat: | 1307 | repeat: |
1308 | for_each_pgdat(pgdat) { | 1308 | for_each_online_pgdat(pgdat) { |
1309 | unsigned long freed; | 1309 | unsigned long freed; |
1310 | 1310 | ||
1311 | freed = balance_pgdat(pgdat, nr_to_free, 0); | 1311 | freed = balance_pgdat(pgdat, nr_to_free, 0); |
@@ -1335,7 +1335,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
1335 | cpumask_t mask; | 1335 | cpumask_t mask; |
1336 | 1336 | ||
1337 | if (action == CPU_ONLINE) { | 1337 | if (action == CPU_ONLINE) { |
1338 | for_each_pgdat(pgdat) { | 1338 | for_each_online_pgdat(pgdat) { |
1339 | mask = node_to_cpumask(pgdat->node_id); | 1339 | mask = node_to_cpumask(pgdat->node_id); |
1340 | if (any_online_cpu(mask) != NR_CPUS) | 1340 | if (any_online_cpu(mask) != NR_CPUS) |
1341 | /* One of our CPUs online: restore mask */ | 1341 | /* One of our CPUs online: restore mask */ |
@@ -1351,7 +1351,7 @@ static int __init kswapd_init(void) | |||
1351 | pg_data_t *pgdat; | 1351 | pg_data_t *pgdat; |
1352 | 1352 | ||
1353 | swap_setup(); | 1353 | swap_setup(); |
1354 | for_each_pgdat(pgdat) { | 1354 | for_each_online_pgdat(pgdat) { |
1355 | pid_t pid; | 1355 | pid_t pid; |
1356 | 1356 | ||
1357 | pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL); | 1357 | pid = kernel_thread(kswapd, pgdat, CLONE_KERNEL); |