diff options
author | Christoph Lameter <clameter@sgi.com> | 2007-10-16 04:25:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:42:58 -0400 |
commit | 2dca53a9dabe76f49209c9128313347510416c68 (patch) | |
tree | 73b58d1f6277305b592f2c53d7b43b151a3f9e3b /arch/ia64/kernel | |
parent | f64dc58c5412233d4d44b0275eaebdc11bde23b3 (diff) |
Memoryless nodes: Uncached allocator updates
The checks for node_online in the uncached allocator are made to make sure
that memory is available on these nodes. Thus switch all the checks to use
N_HIGH_MEMORY and to N_ONLINE.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: Bob Picco <bob.picco@hp.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@skynet.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/uncached.c | 4 |
1 files changed, 2 insertions, 2 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 | } |