iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/iucv: Replace deprecated CPU-hotplug functions.

Browse Source 
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: Julian Wiedmann <jwi@linux.ibm.com>
Cc: Karsten Graul <kgraul@linux.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-s390@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sebastian Andrzej Siewior 2021-08-09 10:30:50 +02:00 committed by David S. Miller
parent 50348fac29
commit 8c39ed4876
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/iucv/iucv.c
View File

@ -502,14 +502,14 @@ static void iucv_setmask_mp(void)
{ {
int cpu; int cpu;
get_online_cpus(); cpus_read_lock();
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
/* Enable all cpus with a declared buffer. */ /* Enable all cpus with a declared buffer. */
if (cpumask_test_cpu(cpu, &iucv_buffer_cpumask) && if (cpumask_test_cpu(cpu, &iucv_buffer_cpumask) &&
!cpumask_test_cpu(cpu, &iucv_irq_cpumask)) !cpumask_test_cpu(cpu, &iucv_irq_cpumask))
smp_call_function_single(cpu, iucv_allow_cpu, smp_call_function_single(cpu, iucv_allow_cpu,
NULL, 1); NULL, 1);
put_online_cpus(); cpus_read_unlock();
} }
/** /**
@ -542,7 +542,7 @@ static int iucv_enable(void)
size_t alloc_size; size_t alloc_size;
int cpu, rc; int cpu, rc;
get_online_cpus(); cpus_read_lock();
rc = -ENOMEM; rc = -ENOMEM;
alloc_size = iucv_max_pathid * sizeof(struct iucv_path); alloc_size = iucv_max_pathid * sizeof(struct iucv_path);
iucv_path_table = kzalloc(alloc_size, GFP_KERNEL); iucv_path_table = kzalloc(alloc_size, GFP_KERNEL);
@ -555,12 +555,12 @@ static int iucv_enable(void)
if (cpumask_empty(&iucv_buffer_cpumask)) if (cpumask_empty(&iucv_buffer_cpumask))
/* No cpu could declare an iucv buffer. */ /* No cpu could declare an iucv buffer. */
goto out; goto out;
put_online_cpus(); cpus_read_unlock();
return 0; return 0;
out: out:
kfree(iucv_path_table); kfree(iucv_path_table);
iucv_path_table = NULL; iucv_path_table = NULL;
put_online_cpus(); cpus_read_unlock();
return rc; return rc;
} }
@ -573,11 +573,11 @@ out:
*/ */
static void iucv_disable(void) static void iucv_disable(void)
{ {
get_online_cpus(); cpus_read_lock();
on_each_cpu(iucv_retrieve_cpu, NULL, 1); on_each_cpu(iucv_retrieve_cpu, NULL, 1);
kfree(iucv_path_table); kfree(iucv_path_table);
iucv_path_table = NULL; iucv_path_table = NULL;
put_online_cpus(); cpus_read_unlock();
} }
static int iucv_cpu_dead(unsigned int cpu) static int iucv_cpu_dead(unsigned int cpu)
@ -786,7 +786,7 @@ static int iucv_reboot_event(struct notifier_block *this,
if (cpumask_empty(&iucv_irq_cpumask)) if (cpumask_empty(&iucv_irq_cpumask))
return NOTIFY_DONE; return NOTIFY_DONE;
get_online_cpus(); cpus_read_lock();
on_each_cpu_mask(&iucv_irq_cpumask, iucv_block_cpu, NULL, 1); on_each_cpu_mask(&iucv_irq_cpumask, iucv_block_cpu, NULL, 1);
preempt_disable(); preempt_disable();
for (i = 0; i < iucv_max_pathid; i++) { for (i = 0; i < iucv_max_pathid; i++) {
@ -794,7 +794,7 @@ static int iucv_reboot_event(struct notifier_block *this,
iucv_sever_pathid(i, NULL); iucv_sever_pathid(i, NULL);
} }
preempt_enable(); preempt_enable();
put_online_cpus(); cpus_read_unlock();
iucv_disable(); iucv_disable();
return NOTIFY_DONE; return NOTIFY_DONE;
} }