x86: Fix error return sequence in __ioremap_caller()

[sfrench/cifs-2.6.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index da432d9f0ae825eb4e050ed8168c1600c6a793da..6ce4aab69e9974aea1838092efc26601ea7598b4 100644 (file)
--- 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)