Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index d7c32de99ee8c49d0e850a06084d5efe508a7625..c5e89eb9ac8ff10e1e15fced114de41058df4a7e 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -32,7 +32,7 @@ static struct mem_section *sparse_index_alloc(int nid)
        unsigned long array_size = SECTIONS_PER_ROOT *
                                   sizeof(struct mem_section);
 
-       if (system_state == SYSTEM_RUNNING)
+       if (slab_is_available())
                section = kmalloc_node(array_size, GFP_KERNEL, nid);
        else
                section = alloc_bootmem_node(NODE_DATA(nid), array_size);