Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 4 insertions, 4 deletions

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 29a89dad68b6..b2c99dc1c5e2 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -280,11 +280,11 @@ static int pcrypt_aead_init_tfm(struct crypto_tfm *tfm)
 
         ictx->tfm_count++;
 
-        cpu_index = ictx->tfm_count % cpumask_weight(cpu_active_mask);
+        cpu_index = ictx->tfm_count % cpumask_weight(cpu_online_mask);
 
-        ctx->cb_cpu = cpumask_first(cpu_active_mask);
+        ctx->cb_cpu = cpumask_first(cpu_online_mask);
         for (cpu = 0; cpu < cpu_index; cpu++)
-                ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_active_mask);
+                ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_online_mask);
 
         cipher = crypto_spawn_aead(crypto_instance_ctx(inst));
 
@@ -472,7 +472,7 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
                 goto err_free_padata;
         }
 
-        cpumask_and(mask->mask, cpu_possible_mask, cpu_active_mask);
+        cpumask_and(mask->mask, cpu_possible_mask, cpu_online_mask);
         rcu_assign_pointer(pcrypt->cb_cpumask, mask);
 
         pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify;