Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 3ec35066f1dc..838eac128409 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -121,7 +121,7 @@ common_shutdown_1(void *generic_ptr)
         /* Wait for the secondaries to halt. */
         set_cpu_present(boot_cpuid, false);
         set_cpu_possible(boot_cpuid, false);
-        while (cpus_weight(cpu_present_map))
+        while (cpumask_weight(cpu_present_mask))
                 barrier();
 #endif