Date: Sat, 19 May 2018 05:07:32 +0000 (UTC) From: Matt Macy <mmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333858 - head/sys/kern Message-ID: <201805190507.w4J57W3D053446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmacy Date: Sat May 19 05:07:31 2018 New Revision: 333858 URL: https://svnweb.freebsd.org/changeset/base/333858 Log: cpuset: revert and annotate instead Modified: head/sys/kern/kern_cpuset.c Modified: head/sys/kern/kern_cpuset.c ============================================================================== --- head/sys/kern/kern_cpuset.c Sat May 19 05:07:03 2018 (r333857) +++ head/sys/kern/kern_cpuset.c Sat May 19 05:07:31 2018 (r333858) @@ -1386,9 +1386,7 @@ cpuset_thread0(void) { struct cpuset *set; int i; -#ifdef INVARIANTS - int error; -#endif + int error __unused; cpuset_zone = uma_zcreate("cpuset", sizeof(struct cpuset), NULL, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); @@ -1413,14 +1411,14 @@ cpuset_thread0(void) * Now derive a default (1), modifiable set from that to give out. */ set = uma_zalloc(cpuset_zone, M_WAITOK | M_ZERO); - DBGSET(error, _cpuset_create(set, cpuset_zero, NULL, NULL, 1)); + error = _cpuset_create(set, cpuset_zero, NULL, NULL, 1); KASSERT(error == 0, ("Error creating default set: %d\n", error)); cpuset_default = set; /* * Create the kernel set (2). */ set = uma_zalloc(cpuset_zone, M_WAITOK | M_ZERO); - DBGSET(error, _cpuset_create(set, cpuset_zero, NULL, NULL, 2)); + error = _cpuset_create(set, cpuset_zero, NULL, NULL, 2); KASSERT(error == 0, ("Error creating kernel set: %d\n", error)); set->cs_domain = &domainset2; cpuset_kernel = set;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805190507.w4J57W3D053446>