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, 1 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 90350f838f05..4a700f4b79ce 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -544,7 +544,8 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp,
                              resp_len, ncpus, mask,
                              DR_CPU_STAT_CONFIGURED);
 
-        mdesc_fill_in_cpu_data(*mask);
+        mdesc_populate_present_mask(mask);
+        mdesc_fill_in_cpu_data(mask);
 
         for_each_cpu_mask(cpu, *mask) {
                 int err;