Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/cpumask.c b/lib/cpumask.c
index eb23aaa0c7b8..7bb4142a502f 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");