padata: remove cpu_index from the parallel_queue

With the removal of the ENODATA case from padata_get_next, the cpu_index
field is no longer useful, so it can go away.

Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/include/linux/padata.h b/include/linux/padata.h
index 43d3fd9d17fc14a27caf6f24312b946f3ea8dfe8..23717eeaad23a59a71358a7dea78a0a91548eb45 100644 (file)
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -75,14 +75,12 @@ struct padata_serial_queue {
  * @swork: work struct for serialization.
  * @work: work struct for parallelization.
  * @num_obj: Number of objects that are processed by this cpu.
- * @cpu_index: Index of the cpu.
  */
 struct padata_parallel_queue {
        struct padata_list    parallel;
        struct padata_list    reorder;
        struct work_struct    work;
        atomic_t              num_obj;
-       int                   cpu_index;
 };
 
 /**

diff --git a/kernel/padata.c b/kernel/padata.c
index 832224dcf2e121a06fbab8c68af7cbafb14885b9..c3fec1413295bb142305d501fd83f694204c8f00 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -400,21 +400,12 @@ static void padata_init_squeues(struct parallel_data *pd)
 /* Initialize all percpu queues used by parallel workers */
 static void padata_init_pqueues(struct parallel_data *pd)
 {
-       int cpu_index, cpu;
+       int cpu;
        struct padata_parallel_queue *pqueue;
 
-       cpu_index = 0;
-       for_each_possible_cpu(cpu) {
+       for_each_cpu(cpu, pd->cpumask.pcpu) {
                pqueue = per_cpu_ptr(pd->pqueue, cpu);
 
-               if (!cpumask_test_cpu(cpu, pd->cpumask.pcpu)) {
-                       pqueue->cpu_index = -1;
-                       continue;
-               }
-
-               pqueue->cpu_index = cpu_index;
-               cpu_index++;
-
                __padata_list_init(&pqueue->reorder);
                __padata_list_init(&pqueue->parallel);
                INIT_WORK(&pqueue->work, padata_parallel_worker);