Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Feb 2017 01:39:13 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314188 - head/sys/kern
Message-ID:  <201702240139.v1O1dDLu075739@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702240139.v1O1dDLu075739>