aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c6
-rw-r--r--mm/vmscan.c6
2 files changed, 6 insertions, 6 deletions
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;
1307repeat: 1307repeat:
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);