From owner-svn-src-all@freebsd.org  Wed Apr 19 17:06:34 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35898D45274;
 Wed, 19 Apr 2017 17:06:34 +0000 (UTC) (envelope-from br@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 E1EE494;
 Wed, 19 Apr 2017 17:06:33 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JH6XAP003443;
 Wed, 19 Apr 2017 17:06:33 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JH6WLK003439;
 Wed, 19 Apr 2017 17:06:32 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201704191706.v3JH6WLK003439@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Wed, 19 Apr 2017 17:06:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317151 - in head/sys/riscv: include riscv
X-SVN-Group: head
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.23
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: Wed, 19 Apr 2017 17:06:34 -0000

Author: br
Date: Wed Apr 19 17:06:32 2017
New Revision: 317151
URL: https://svnweb.freebsd.org/changeset/base/317151

Log:
  Follow r317061 "Remove struct vmmeter from struct pcpu"
  with MD changes for RISC-V.
  
  This unbreaks RISC-V build.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/riscv/include/counter.h
  head/sys/riscv/include/pcpu.h
  head/sys/riscv/riscv/intr_machdep.c
  head/sys/riscv/riscv/minidump_machdep.c

Modified: head/sys/riscv/include/counter.h
==============================================================================
--- head/sys/riscv/include/counter.h	Wed Apr 19 16:24:51 2017	(r317150)
+++ head/sys/riscv/include/counter.h	Wed Apr 19 17:06:32 2017	(r317151)
@@ -34,6 +34,10 @@
 #include <sys/proc.h>
 #endif
 
+extern struct pcpu __pcpu[];
+
+#define	EARLY_COUNTER	&__pcpu[0].pc_early_dummy_counter
+
 #define	counter_enter()	critical_enter()
 #define	counter_exit()	critical_exit()
 

Modified: head/sys/riscv/include/pcpu.h
==============================================================================
--- head/sys/riscv/include/pcpu.h	Wed Apr 19 16:24:51 2017	(r317150)
+++ head/sys/riscv/include/pcpu.h	Wed Apr 19 17:06:32 2017	(r317151)
@@ -46,7 +46,7 @@
 
 #define	PCPU_MD_FIELDS							\
 	uint32_t pc_pending_ipis;	/* IPIs pending to this CPU */	\
-	char __pad[125]
+	char __pad[61]
 
 #ifdef _KERNEL
 

Modified: head/sys/riscv/riscv/intr_machdep.c
==============================================================================
--- head/sys/riscv/riscv/intr_machdep.c	Wed Apr 19 16:24:51 2017	(r317150)
+++ head/sys/riscv/riscv/intr_machdep.c	Wed Apr 19 17:06:32 2017	(r317151)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/cpuset.h>
 #include <sys/interrupt.h>
 #include <sys/smp.h>
+#include <sys/vmmeter.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
@@ -231,7 +232,7 @@ riscv_cpu_intr(struct trapframe *frame)
 		event = intr_events[active_irq];
 		/* Update counters */
 		atomic_add_long(riscv_intr_counters[active_irq], 1);
-		PCPU_INC(cnt.v_intr);
+		VM_CNT_INC(v_intr);
 		break;
 	default:
 		event = NULL;

Modified: head/sys/riscv/riscv/minidump_machdep.c
==============================================================================
--- head/sys/riscv/riscv/minidump_machdep.c	Wed Apr 19 16:24:51 2017	(r317150)
+++ head/sys/riscv/riscv/minidump_machdep.c	Wed Apr 19 17:06:32 2017	(r317151)
@@ -37,11 +37,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/kerneldump.h>
 #include <sys/msgbuf.h>
 #include <sys/watchdog.h>
+#include <sys/vmmeter.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
 #include <vm/vm_phys.h>
 #include <vm/pmap.h>
+
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>