diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-09-21 17:01:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 07:17:26 -0700 |
| commit | f52407ce2deac76c87abc8211a63ea152ba72d54 (patch) | |
| tree | 6e3976fae721bd178d68d11750f7ad7f86d8feca /mm/sparse.c | |
| parent | 8e7e40d9658cf7b2ae2b76484e235799b3ddaa97 (diff) | |
| download | linux-3.10-f52407ce2deac76c87abc8211a63ea152ba72d54.tar.gz linux-3.10-f52407ce2deac76c87abc8211a63ea152ba72d54.tar.bz2 linux-3.10-f52407ce2deac76c87abc8211a63ea152ba72d54.zip | |
memory hotplug: alloc page from other node in memory online
To initialize hotadded node, some pages are allocated. At that time, the
node hasn't memory, this makes the allocation always fail. In such case,
let's allocate pages from other nodes.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Yakui Zhao <yakui.zhao@intel.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/sparse.c')
| -rw-r--r-- | mm/sparse.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index da432d9f0ae..6ce4aab69e9 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -62,9 +62,12 @@ static struct mem_section noinline __init_refok *sparse_index_alloc(int nid) unsigned long array_size = SECTIONS_PER_ROOT * sizeof(struct mem_section); - if (slab_is_available()) - section = kmalloc_node(array_size, GFP_KERNEL, nid); - else + if (slab_is_available()) { + if (node_state(nid, N_HIGH_MEMORY)) + section = kmalloc_node(array_size, GFP_KERNEL, nid); + else + section = kmalloc(array_size, GFP_KERNEL); + } else section = alloc_bootmem_node(NODE_DATA(nid), array_size); if (section) |