Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c51636a3 authored by Daniel Jordan's avatar Daniel Jordan Committed by Herbert Xu
Browse files

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: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: default avatarSteffen 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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bfde23ce

include/linux/padata.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

};



/**

kernel/padata.c

+2 −11
Original line number Diff line number Diff line
@@ -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);