Skip to content

Commit

Permalink
mm/sparse: optimize sparse_index_alloc
Browse files Browse the repository at this point in the history
With CONFIG_SPARSEMEM_EXTREME, the two levels of memory section
descriptors are allocated from slab or bootmem.  When allocating from
slab, let slab/bootmem allocator clear the memory chunk.  We needn't clear
it explicitly.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Gavin Shan authored and Linus Torvalds committed Aug 1, 2012
1 parent b214514 commit 5b760e6
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions mm/sparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@ static struct mem_section noinline __init_refok *sparse_index_alloc(int nid)

if (slab_is_available()) {
if (node_state(nid, N_HIGH_MEMORY))
section = kmalloc_node(array_size, GFP_KERNEL, nid);
section = kzalloc_node(array_size, GFP_KERNEL, nid);
else
section = kmalloc(array_size, GFP_KERNEL);
} else
section = kzalloc(array_size, GFP_KERNEL);
} else {
section = alloc_bootmem_node(NODE_DATA(nid), array_size);

if (section)
memset(section, 0, array_size);
}

return section;
}
Expand Down

0 comments on commit 5b760e6

Please sign in to comment.