Skip to content

L
linux
Commit f2019030 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by David S. Miller
Browse files
Options

convert old cpumask API into new one 

Adapt new API.
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f6298a6
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 36 deletions
net/iucv/iucv.c
View file @ f2019030
...@@ -128,8 +128,8 @@ struct iucv_irq_list { ...@@ -128,8 +128,8 @@ struct iucv_irq_list {
}; };
static struct iucv_irq_data *iucv_irq_data[NR_CPUS]; static struct iucv_irq_data *iucv_irq_data[NR_CPUS];
static cpumask_t iucv_buffer_cpumask = CPU_MASK_NONE; static cpumask_t iucv_buffer_cpumask = { CPU_BITS_NONE };
static cpumask_t iucv_irq_cpumask = CPU_MASK_NONE; static cpumask_t iucv_irq_cpumask = { CPU_BITS_NONE };
/* /*
* Queue of interrupt buffers lock for delivery via the tasklet * Queue of interrupt buffers lock for delivery via the tasklet
...@@ -406,7 +406,7 @@ static void iucv_allow_cpu(void *data) ...@@ -406,7 +406,7 @@ static void iucv_allow_cpu(void *data)
parm->set_mask.ipmask = 0xf8; parm->set_mask.ipmask = 0xf8;
iucv_call_b2f0(IUCV_SETCONTROLMASK, parm); iucv_call_b2f0(IUCV_SETCONTROLMASK, parm);
/* Set indication that iucv interrupts are allowed for this cpu. */ /* Set indication that iucv interrupts are allowed for this cpu. */
cpu_set(cpu, iucv_irq_cpumask); cpumask_set_cpu(cpu, &iucv_irq_cpumask);
} }
/** /**
...@@ -426,7 +426,7 @@ static void iucv_block_cpu(void *data) ...@@ -426,7 +426,7 @@ static void iucv_block_cpu(void *data)
iucv_call_b2f0(IUCV_SETMASK, parm); iucv_call_b2f0(IUCV_SETMASK, parm);
/* Clear indication that iucv interrupts are allowed for this cpu. */ /* Clear indication that iucv interrupts are allowed for this cpu. */
cpu_clear(cpu, iucv_irq_cpumask); cpumask_clear_cpu(cpu, &iucv_irq_cpumask);
} }
/** /**
...@@ -451,7 +451,7 @@ static void iucv_block_cpu_almost(void *data) ...@@ -451,7 +451,7 @@ static void iucv_block_cpu_almost(void *data)
iucv_call_b2f0(IUCV_SETCONTROLMASK, parm); iucv_call_b2f0(IUCV_SETCONTROLMASK, parm);
/* Clear indication that iucv interrupts are allowed for this cpu. */ /* Clear indication that iucv interrupts are allowed for this cpu. */
cpu_clear(cpu, iucv_irq_cpumask); cpumask_clear_cpu(cpu, &iucv_irq_cpumask);
} }
/** /**
...@@ -466,7 +466,7 @@ static void iucv_declare_cpu(void *data) ...@@ -466,7 +466,7 @@ static void iucv_declare_cpu(void *data)
union iucv_param *parm; union iucv_param *parm;
int rc; int rc;
if (cpu_isset(cpu, iucv_buffer_cpumask)) if (cpumask_test_cpu(cpu, &iucv_buffer_cpumask))
return; return;
/* Declare interrupt buffer. */ /* Declare interrupt buffer. */
...@@ -499,9 +499,9 @@ static void iucv_declare_cpu(void *data) ...@@ -499,9 +499,9 @@ static void iucv_declare_cpu(void *data)
} }
/* Set indication that an iucv buffer exists for this cpu. */ /* Set indication that an iucv buffer exists for this cpu. */
cpu_set(cpu, iucv_buffer_cpumask); cpumask_set_cpu(cpu, &iucv_buffer_cpumask);
if (iucv_nonsmp_handler == 0 || cpus_empty(iucv_irq_cpumask)) if (iucv_nonsmp_handler == 0 || cpumask_empty(&iucv_irq_cpumask))
/* Enable iucv interrupts on this cpu. */ /* Enable iucv interrupts on this cpu. */
iucv_allow_cpu(NULL); iucv_allow_cpu(NULL);
else else
...@@ -520,7 +520,7 @@ static void iucv_retrieve_cpu(void *data) ...@@ -520,7 +520,7 @@ static void iucv_retrieve_cpu(void *data)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
union iucv_param *parm; union iucv_param *parm;
if (!cpu_isset(cpu, iucv_buffer_cpumask)) if (!cpumask_test_cpu(cpu, &iucv_buffer_cpumask))
return; return;
/* Block iucv interrupts. */ /* Block iucv interrupts. */
...@@ -531,7 +531,7 @@ static void iucv_retrieve_cpu(void *data) ...@@ -531,7 +531,7 @@ static void iucv_retrieve_cpu(void *data)
iucv_call_b2f0(IUCV_RETRIEVE_BUFFER, parm); iucv_call_b2f0(IUCV_RETRIEVE_BUFFER, parm);
/* Clear indication that an iucv buffer exists for this cpu. */ /* Clear indication that an iucv buffer exists for this cpu. */
cpu_clear(cpu, iucv_buffer_cpumask); cpumask_clear_cpu(cpu, &iucv_buffer_cpumask);
} }
/** /**
...@@ -546,8 +546,8 @@ static void iucv_setmask_mp(void) ...@@ -546,8 +546,8 @@ static void iucv_setmask_mp(void)
get_online_cpus(); get_online_cpus();
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 (cpu_isset(cpu, iucv_buffer_cpumask) && if (cpumask_test_cpu(cpu, &iucv_buffer_cpumask) &&
!cpu_isset(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(); put_online_cpus();
...@@ -564,9 +564,9 @@ static void iucv_setmask_up(void) ...@@ -564,9 +564,9 @@ static void iucv_setmask_up(void)
int cpu; int cpu;
/* Disable all cpu but the first in cpu_irq_cpumask. */ /* Disable all cpu but the first in cpu_irq_cpumask. */
cpumask = iucv_irq_cpumask; cpumask_copy(&cpumask, &iucv_irq_cpumask);
cpu_clear(first_cpu(iucv_irq_cpumask), cpumask); cpumask_clear_cpu(cpumask_first(&iucv_irq_cpumask), &cpumask);
for_each_cpu_mask_nr(cpu, cpumask) for_each_cpu(cpu, &cpumask)
smp_call_function_single(cpu, iucv_block_cpu, NULL, 1); smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
} }
...@@ -593,7 +593,7 @@ static int iucv_enable(void) ...@@ -593,7 +593,7 @@ static int iucv_enable(void)
rc = -EIO; rc = -EIO;
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1); smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
if (cpus_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(); put_online_cpus();
...@@ -675,15 +675,16 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self, ...@@ -675,15 +675,16 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
case CPU_DOWN_PREPARE_FROZEN: case CPU_DOWN_PREPARE_FROZEN:
if (!iucv_path_table) if (!iucv_path_table)
break; break;
cpumask = iucv_buffer_cpumask; cpumask_copy(&cpumask, &iucv_buffer_cpumask);
cpu_clear(cpu, cpumask); cpumask_clear_cpu(cpu, &cpumask);
if (cpus_empty(cpumask)) if (cpumask_empty(&cpumask))
/* Can't offline last IUCV enabled cpu. */ /* Can't offline last IUCV enabled cpu. */
return notifier_from_errno(-EINVAL); return notifier_from_errno(-EINVAL);
smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 1); smp_call_function_single(cpu, iucv_retrieve_cpu, NULL, 1);
if (cpus_empty(iucv_irq_cpumask)) if (cpumask_empty(&iucv_irq_cpumask))
smp_call_function_single(first_cpu(iucv_buffer_cpumask), smp_call_function_single(
iucv_allow_cpu, NULL, 1); cpumask_first(&iucv_buffer_cpumask),
iucv_allow_cpu, NULL, 1);
break; break;
} }
return NOTIFY_OK; return NOTIFY_OK;
...@@ -866,7 +867,7 @@ int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler, ...@@ -866,7 +867,7 @@ int iucv_path_accept(struct iucv_path *path, struct iucv_handler *handler,
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -915,7 +916,7 @@ int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler, ...@@ -915,7 +916,7 @@ int iucv_path_connect(struct iucv_path *path, struct iucv_handler *handler,
spin_lock_bh(&iucv_table_lock); spin_lock_bh(&iucv_table_lock);
iucv_cleanup_queue(); iucv_cleanup_queue();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -975,7 +976,7 @@ int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16]) ...@@ -975,7 +976,7 @@ int iucv_path_quiesce(struct iucv_path *path, u8 userdata[16])
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1007,7 +1008,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16]) ...@@ -1007,7 +1008,7 @@ int iucv_path_resume(struct iucv_path *path, u8 userdata[16])
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1036,7 +1037,7 @@ int iucv_path_sever(struct iucv_path *path, u8 userdata[16]) ...@@ -1036,7 +1037,7 @@ int iucv_path_sever(struct iucv_path *path, u8 userdata[16])
int rc; int rc;
preempt_disable(); preempt_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1070,7 +1071,7 @@ int iucv_message_purge(struct iucv_path *path, struct iucv_message *msg, ...@@ -1070,7 +1071,7 @@ int iucv_message_purge(struct iucv_path *path, struct iucv_message *msg,
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1162,7 +1163,7 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg, ...@@ -1162,7 +1163,7 @@ int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
if (msg->flags & IUCV_IPRMDATA) if (msg->flags & IUCV_IPRMDATA)
return iucv_message_receive_iprmdata(path, msg, flags, return iucv_message_receive_iprmdata(path, msg, flags,
buffer, size, residual); buffer, size, residual);
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1235,7 +1236,7 @@ int iucv_message_reject(struct iucv_path *path, struct iucv_message *msg) ...@@ -1235,7 +1236,7 @@ int iucv_message_reject(struct iucv_path *path, struct iucv_message *msg)
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1274,7 +1275,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg, ...@@ -1274,7 +1275,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg,
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1324,7 +1325,7 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg, ...@@ -1324,7 +1325,7 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
union iucv_param *parm; union iucv_param *parm;
int rc; int rc;
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1411,7 +1412,7 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg, ...@@ -1411,7 +1412,7 @@ int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,
int rc; int rc;
local_bh_disable(); local_bh_disable();
if (cpus_empty(iucv_buffer_cpumask)) { if (cpumask_empty(&iucv_buffer_cpumask)) {
rc = -EIO; rc = -EIO;
goto out; goto out;
} }
...@@ -1888,7 +1889,7 @@ static int iucv_pm_freeze(struct device *dev) ...@@ -1888,7 +1889,7 @@ static int iucv_pm_freeze(struct device *dev)
printk(KERN_WARNING "iucv_pm_freeze\n"); printk(KERN_WARNING "iucv_pm_freeze\n");
#endif #endif
if (iucv_pm_state != IUCV_PM_FREEZING) { if (iucv_pm_state != IUCV_PM_FREEZING) {
for_each_cpu_mask_nr(cpu, iucv_irq_cpumask) for_each_cpu(cpu, &iucv_irq_cpumask)
smp_call_function_single(cpu, iucv_block_cpu_almost, smp_call_function_single(cpu, iucv_block_cpu_almost,
NULL, 1); NULL, 1);
cancel_work_sync(&iucv_work); cancel_work_sync(&iucv_work);
...@@ -1928,7 +1929,7 @@ static int iucv_pm_thaw(struct device *dev) ...@@ -1928,7 +1929,7 @@ static int iucv_pm_thaw(struct device *dev)
if (rc) if (rc)
goto out; goto out;
} }
if (cpus_empty(iucv_irq_cpumask)) { if (cpumask_empty(&iucv_irq_cpumask)) {
if (iucv_nonsmp_handler) if (iucv_nonsmp_handler)
/* enable interrupts on one cpu */ /* enable interrupts on one cpu */
iucv_allow_cpu(NULL); iucv_allow_cpu(NULL);
...@@ -1961,7 +1962,7 @@ static int iucv_pm_restore(struct device *dev) ...@@ -1961,7 +1962,7 @@ static int iucv_pm_restore(struct device *dev)
pr_warning("Suspending Linux did not completely close all IUCV " pr_warning("Suspending Linux did not completely close all IUCV "
"connections\n"); "connections\n");
iucv_pm_state = IUCV_PM_RESTORING; iucv_pm_state = IUCV_PM_RESTORING;
if (cpus_empty(iucv_irq_cpumask)) { if (cpumask_empty(&iucv_irq_cpumask)) {
rc = iucv_query_maxconn(); rc = iucv_query_maxconn();
rc = iucv_enable(); rc = iucv_enable();
if (rc) if (rc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7