aboutsummaryrefslogtreecommitdiff
path: root/lib/cpumask.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-05-25 15:10:58 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-06-11 19:27:07 +0300
commit38c7fed2f5ffee17e1fa3e0f78b0e1bf43d52d13 (patch)
tree52544d8dcfadbd5347872eae23939fe387d7c78b /lib/cpumask.c
parenta5f4f52e82114e85aa1a066bd1a450acc19a464d (diff)
x86: remove some alloc_bootmem_cpumask_var calling
Now that we set up the slab allocator earlier, we can get rid of some alloc_bootmem_cpumask_var() calls in boot code. Cc: Ingo Molnar <mingo@elte.hu> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'lib/cpumask.c')
-rw-r--r--lib/cpumask.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/cpumask.c b/lib/cpumask.c
index eb23aaa0c7b..7bb4142a502 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -92,15 +92,8 @@ int cpumask_any_but(const struct cpumask *mask, unsigned int cpu)
*/
bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)
{
- if (likely(slab_is_available()))
- *mask = kmalloc_node(cpumask_size(), flags, node);
- else {
-#ifdef CONFIG_DEBUG_PER_CPU_MAPS
- printk(KERN_ERR
- "=> alloc_cpumask_var: kmalloc not available!\n");
-#endif
- *mask = NULL;
- }
+ *mask = kmalloc_node(cpumask_size(), flags, node);
+
#ifdef CONFIG_DEBUG_PER_CPU_MAPS
if (!*mask) {
printk(KERN_ERR "=> alloc_cpumask_var: failed!\n");