From owner-svn-src-head@freebsd.org Fri Feb 24 01:39:14 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33652CE8F22; Fri, 24 Feb 2017 01:39:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0318E198B; Fri, 24 Feb 2017 01:39:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1O1dDid075740; Fri, 24 Feb 2017 01:39:13 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1O1dDLu075739; Fri, 24 Feb 2017 01:39:13 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702240139.v1O1dDLu075739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 24 Feb 2017 01:39:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314188 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 01:39:14 -0000 Author: imp Date: Fri Feb 24 01:39:12 2017 New Revision: 314188 URL: https://svnweb.freebsd.org/changeset/base/314188 Log: Cast values to (int) before comparing them to the range of the enum. This ensures they are in range w/o the warnings. Modified: head/sys/kern/kern_pmc.c Modified: head/sys/kern/kern_pmc.c ============================================================================== --- head/sys/kern/kern_pmc.c Fri Feb 24 01:39:08 2017 (r314187) +++ head/sys/kern/kern_pmc.c Fri Feb 24 01:39:12 2017 (r314188) @@ -287,8 +287,8 @@ pmc_soft_ev_deregister(struct pmc_soft * if (ps->ps_ev.pm_ev_code != 0 && (ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST) < pmc_softevents) { - KASSERT(ps->ps_ev.pm_ev_code >= PMC_EV_SOFT_FIRST && - ps->ps_ev.pm_ev_code <= PMC_EV_SOFT_LAST, + KASSERT((int)ps->ps_ev.pm_ev_code >= PMC_EV_SOFT_FIRST && + (int)ps->ps_ev.pm_ev_code <= PMC_EV_SOFT_LAST, ("pmc_soft_deregister: invalid event value")); pmc_softs[ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST] = NULL; } @@ -304,8 +304,8 @@ pmc_soft_ev_acquire(enum pmc_event ev) if (ev == 0 || (ev - PMC_EV_SOFT_FIRST) >= pmc_softevents) return NULL; - KASSERT(ev >= PMC_EV_SOFT_FIRST && - ev <= PMC_EV_SOFT_LAST, + KASSERT((int)ev >= PMC_EV_SOFT_FIRST && + (int)ev <= PMC_EV_SOFT_LAST, ("event out of range")); mtx_lock_spin(&pmc_softs_mtx);