Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the case when a CPU is assigned to a set it is already a member of. 

Previously this would trigger an assertion failure.
This commit is contained in:
mlelstv 2018-12-09 23:05:02 +00:00
parent a391bfdb6d
commit 784e861daf
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/sys_pset.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_pset.c,v 1.20 2018/09/03 16:29:35 riastradh Exp $ */ /* $NetBSD: sys_pset.c,v 1.21 2018/12/09 23:05:02 mlelstv Exp $ */
/* /*
* Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org> * Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_pset.c,v 1.20 2018/09/03 16:29:35 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: sys_pset.c,v 1.21 2018/12/09 23:05:02 mlelstv Exp $");
#include <sys/param.h> #include <sys/param.h>
@ -351,6 +351,12 @@ sys_pset_assign(struct lwp *l, const struct sys_pset_assign_args *uap,
psid = curlwp->l_psid; psid = curlwp->l_psid;
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
/*
* Just finish if old and new processor-sets are
* the same.
*/
if (spc->spc_psid == psid)
break;
/* /*
* Ensure at least one CPU stays in the default set, * Ensure at least one CPU stays in the default set,
* and that specified CPU is not offline. * and that specified CPU is not offline.