Commit 80771c82 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Herbert Xu
Browse files

padata: Replace deprecated CPU-hotplug functions. 



The functions get_online_cpus() and put_online_cpus() have been
deprecated during the CPU hotplug rework. They map directly to
cpus_read_lock() and cpus_read_unlock().

Replace deprecated CPU-hotplug functions with the official version.
The behavior remains unchanged.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d01a9f70

kernel/padata.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -733,7 +733,7 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, 
	struct cpumask *serial_mask, *parallel_mask;

	struct cpumask *serial_mask, *parallel_mask;

	int err = -EINVAL;

	int err = -EINVAL;





	get_online_cpus();

	cpus_read_lock();

	mutex_lock(&pinst->lock);

	mutex_lock(&pinst->lock);





	switch (cpumask_type) {

	switch (cpumask_type) {
@@ -753,7 +753,7 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, 




out:

out:

	mutex_unlock(&pinst->lock);

	mutex_unlock(&pinst->lock);

	put_online_cpus();

	cpus_read_unlock();





	return err;

	return err;

}

}
@@ -992,7 +992,7 @@ struct padata_instance *padata_alloc(const char *name) 
	if (!pinst->parallel_wq)

	if (!pinst->parallel_wq)

		goto err_free_inst;

		goto err_free_inst;





	get_online_cpus();

	cpus_read_lock();





	pinst->serial_wq = alloc_workqueue("%s_serial", WQ_MEM_RECLAIM |

	pinst->serial_wq = alloc_workqueue("%s_serial", WQ_MEM_RECLAIM |

					   WQ_CPU_INTENSIVE, 1, name);

					   WQ_CPU_INTENSIVE, 1, name);
@@ -1026,7 +1026,7 @@ struct padata_instance *padata_alloc(const char *name) 
						    &pinst->cpu_dead_node);

						    &pinst->cpu_dead_node);

#endif

#endif





	put_online_cpus();

	cpus_read_unlock();





	return pinst;

	return pinst;
@@ -1036,7 +1036,7 @@ struct padata_instance *padata_alloc(const char *name) 
err_free_serial_wq:

err_free_serial_wq:

	destroy_workqueue(pinst->serial_wq);

	destroy_workqueue(pinst->serial_wq);

err_put_cpus:

err_put_cpus:

	put_online_cpus();

	cpus_read_unlock();

	destroy_workqueue(pinst->parallel_wq);

	destroy_workqueue(pinst->parallel_wq);

err_free_inst:

err_free_inst:

	kfree(pinst);

	kfree(pinst);
@@ -1074,9 +1074,9 @@ struct padata_shell *padata_alloc_shell(struct padata_instance *pinst) 




	ps->pinst = pinst;

	ps->pinst = pinst;





	get_online_cpus();

	cpus_read_lock();

	pd = padata_alloc_pd(ps);

	pd = padata_alloc_pd(ps);

	put_online_cpus();

	cpus_read_unlock();





	if (!pd)

	if (!pd)

		goto out_free_ps;

		goto out_free_ps;