aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/uncached.c4
-rw-r--r--drivers/char/mspec.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index c58e933694d5..a7be4f203420 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -196,7 +196,7 @@ unsigned long uncached_alloc_page(int starting_nid)
196 nid = starting_nid; 196 nid = starting_nid;
197 197
198 do { 198 do {
199 if (!node_online(nid)) 199 if (!node_state(nid, N_HIGH_MEMORY))
200 continue; 200 continue;
201 uc_pool = &uncached_pools[nid]; 201 uc_pool = &uncached_pools[nid];
202 if (uc_pool->pool == NULL) 202 if (uc_pool->pool == NULL)
@@ -268,7 +268,7 @@ static int __init uncached_init(void)
268{ 268{
269 int nid; 269 int nid;
270 270
271 for_each_online_node(nid) { 271 for_each_node_state(nid, N_ONLINE) {
272 uncached_pools[nid].pool = gen_pool_create(PAGE_SHIFT, nid); 272 uncached_pools[nid].pool = gen_pool_create(PAGE_SHIFT, nid);
273 mutex_init(&uncached_pools[nid].add_chunk_mutex); 273 mutex_init(&uncached_pools[nid].add_chunk_mutex);
274 } 274 }
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index 04ac155d3a07..82f2e27dca7d 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -362,7 +362,7 @@ mspec_init(void)
362 is_sn2 = 1; 362 is_sn2 = 1;
363 if (is_shub2()) { 363 if (is_shub2()) {
364 ret = -ENOMEM; 364 ret = -ENOMEM;
365 for_each_online_node(nid) { 365 for_each_node_state(nid, N_ONLINE) {
366 int actual_nid; 366 int actual_nid;
367 int nasid; 367 int nasid;
368 unsigned long phys; 368 unsigned long phys;