diff --git a/NEWS b/NEWS index 8ddaadf05391ee413f817f3abe0e5ed5f59b5954..40e242cca1d1e72f8c1175762b01f72bde1e07f7 100644 --- a/NEWS +++ b/NEWS @@ -16,8 +16,6 @@ documents those changes that are of interest to users and administrators. -- Cray - Fix node list parsing in capmc_suspend/resume programs. -- Fix sbatch #BSUB parsing for -W and -M options. -- Fix GRES task layout bug that could cause slurmctld to abort. - -- Fix for uninitialized variable in task binding logic, could leave tasks - with fewer CPUs than intended. * Changes in Slurm 16.05.0rc2 ============================= diff --git a/src/plugins/task/affinity/affinity.c b/src/plugins/task/affinity/affinity.c index 167c0fc93838f0d27b18555dbbc51c6a55bb6e35..d4f4a558c0d958fd09bcb07cb64918a3f286dc34 100644 --- a/src/plugins/task/affinity/affinity.c +++ b/src/plugins/task/affinity/affinity.c @@ -329,10 +329,8 @@ void reset_cpuset(cpu_set_t *new_mask, cpu_set_t *cur_mask) cpu_set_t full_mask, newer_mask; int cur_offset, new_offset = 0, last_set = -1; - if (!_is_power_cpu()) { - CPU_OR(new_mask, new_mask, cur_mask); + if (!_is_power_cpu()) return; - } if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) { /* Try to get full CPU mask from process init */