driver: Avoid deprecated usage of cpumask API

We used the legacy API so far, and that will be removed in 4.1.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/driver/cell.c b/driver/cell.c
index 89d1141d3e316f7ef352d727a393340e34a2d7b4..527a3f090dc38c2ebbfcd981428951cd8b2891f0 100644 (file)
--- a/driver/cell.c
+++ b/driver/cell.c
@@ -144,7 +144,7 @@ void jailhouse_cell_delete_all(void)
                if (cpu_up(cpu) != 0)
                        pr_err("Jailhouse: failed to bring CPU %d back "
                               "online\n", cpu);
-               cpu_clear(cpu, offlined_cpus);
+               cpumask_clear_cpu(cpu, &offlined_cpus);
        }
 }
 
@@ -205,9 +205,9 @@ int jailhouse_cmd_cell_create(struct jailhouse_cell_create __user *arg)
                        err = cpu_down(cpu);
                        if (err)
                                goto error_cpu_online;
-                       cpu_set(cpu, offlined_cpus);
+                       cpumask_set_cpu(cpu, &offlined_cpus);
                }
-               cpu_clear(cpu, root_cell->cpus_assigned);
+               cpumask_clear_cpu(cpu, &root_cell->cpus_assigned);
        }
 
        id = jailhouse_call_arg1(JAILHOUSE_HC_CELL_CREATE, __pa(config));
@@ -232,8 +232,8 @@ kfree_config_out:
 error_cpu_online:
        for_each_cpu(cpu, &cell->cpus_assigned) {
                if (!cpu_online(cpu) && cpu_up(cpu) == 0)
-                       cpu_clear(cpu, offlined_cpus);
-               cpu_set(cpu, root_cell->cpus_assigned);
+                       cpumask_clear_cpu(cpu, &offlined_cpus);
+               cpumask_set_cpu(cpu, &root_cell->cpus_assigned);
        }
 
 error_cell_delete:
@@ -381,13 +381,13 @@ int jailhouse_cmd_cell_destroy(const char __user *arg)
                goto unlock_out;
 
        for_each_cpu(cpu, &cell->cpus_assigned) {
-               if (cpu_isset(cpu, offlined_cpus)) {
+               if (cpumask_test_cpu(cpu, &offlined_cpus)) {
                        if (cpu_up(cpu) != 0)
                                pr_err("Jailhouse: failed to bring CPU %d "
                                       "back online\n", cpu);
-                       cpu_clear(cpu, offlined_cpus);
+                       cpumask_clear_cpu(cpu, &offlined_cpus);
                }
-               cpu_set(cpu, root_cell->cpus_assigned);
+               cpumask_set_cpu(cpu, &root_cell->cpus_assigned);
        }
 
        pr_info("Destroyed Jailhouse cell \"%s\"\n",

diff --git a/driver/sysfs.c b/driver/sysfs.c
index 52b460ee804902e48c82c30eaf76b0b6d3ed9400..98991fd5ac74e9b03dbf926724d020af218a2321 100644 (file)
--- a/driver/sysfs.c
+++ b/driver/sysfs.c
@@ -194,7 +194,7 @@ static ssize_t cpus_failed_show(struct kobject *kobj,
                if (jailhouse_call_arg2(JAILHOUSE_HC_CPU_GET_INFO, cpu,
                                        JAILHOUSE_CPU_INFO_STATE) ==
                    JAILHOUSE_CPU_FAILED)
-                       cpu_set(cpu, *cpus_failed);
+                       cpumask_set_cpu(cpu, cpus_failed);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
        written = scnprintf(buf, PAGE_SIZE, "%*pb\n",