From owner-svn-src-head@freebsd.org  Mon Jun  4 04:49:07 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27336FEF1EB;
 Mon,  4 Jun 2018 04:49:07 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CB6F070716;
 Mon,  4 Jun 2018 04:49:06 +0000 (UTC)
 (envelope-from mmacy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD57F8D7;
 Mon,  4 Jun 2018 04:49:06 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w544n6WD054853;
 Mon, 4 Jun 2018 04:49:06 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w544n6Kc054852;
 Mon, 4 Jun 2018 04:49:06 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201806040449.w544n6Kc054852@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Mon, 4 Jun 2018 04:49:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334598 - head/sys/dev/hwpmc
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/dev/hwpmc
X-SVN-Commit-Revision: 334598
X-SVN-Commit-Repository: base
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.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2018 04:49:07 -0000

Author: mmacy
Date: Mon Jun  4 04:49:06 2018
New Revision: 334598
URL: https://svnweb.freebsd.org/changeset/base/334598

Log:
  hwpmc: fix fixed counters checks

Modified:
  head/sys/dev/hwpmc/hwpmc_core.c

Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c	Mon Jun  4 03:16:24 2018	(r334597)
+++ head/sys/dev/hwpmc/hwpmc_core.c	Mon Jun  4 04:49:06 2018	(r334598)
@@ -251,13 +251,12 @@ iaf_allocate_pmc(int cpu, int ri, struct pmc *pm,
 	if (ev == 0xC0 && ri != 0)
 		return (EINVAL);
 	/* CPU_CLK_UNHALTED.THREAD */
-	else if (ev == 0x3C && ri != 1)
+	if (ev == 0x3C && ri != 1)
 		return (EINVAL);
 	/* CPU_CLK_UNHALTED.REF */
-	else if (ev == 0x0 && umask == 0x3 && ri != 2)
+	if (ev == 0x0 && umask == 0x3 && ri != 2)
 		return (EINVAL);
-	else
-		return (EINVAL);
+
 
 	flags = 0;
 	if (config & IAP_OS)