From owner-svn-src-all@freebsd.org  Fri Jun  8 05:48:29 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 21C4E1011415;
 Fri,  8 Jun 2018 05:48:29 +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 B96E5744DB;
 Fri,  8 Jun 2018 05:48:28 +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 962CE2BD7;
 Fri,  8 Jun 2018 05:48:28 +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 w585mSEo032773;
 Fri, 8 Jun 2018 05:48:28 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w585mSa2032772;
 Fri, 8 Jun 2018 05:48:28 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201806080548.w585mSa2032772@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: Fri, 8 Jun 2018 05:48:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334831 - 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: 334831
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jun 2018 05:48:29 -0000

Author: mmacy
Date: Fri Jun  8 05:48:28 2018
New Revision: 334831
URL: https://svnweb.freebsd.org/changeset/base/334831

Log:
  hwpmc: fix arm64 INVARIANTS build

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

Modified: head/sys/dev/hwpmc/hwpmc_arm64.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_arm64.c	Fri Jun  8 05:40:36 2018	(r334830)
+++ head/sys/dev/hwpmc/hwpmc_arm64.c	Fri Jun  8 05:48:28 2018	(r334831)
@@ -331,11 +331,11 @@ arm64_intr(struct trapframe *tf)
 	int error;
 	int reg, cpu;
 
+	cpu = curcpu;
 	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
 	    ("[arm64,%d] CPU %d out of range", __LINE__, cpu));
 
 	retval = 0;
-	cpu = curcpu;
 	pc = arm64_pcpu[cpu];
 
 	for (ri = 0; ri < arm64_npmcs; ri++) {