From owner-svn-src-all@freebsd.org  Sat Sep  7 05:13:32 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC5F0E5731;
 Sat,  7 Sep 2019 05:13:32 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46QMyh5S1rz47FG;
 Sat,  7 Sep 2019 05:13:32 +0000 (UTC)
 (envelope-from philip@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 9E7F775F;
 Sat,  7 Sep 2019 05:13:32 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x875DWBN016074;
 Sat, 7 Sep 2019 05:13:32 GMT (envelope-from philip@FreeBSD.org)
Received: (from philip@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x875DWNk016072;
 Sat, 7 Sep 2019 05:13:32 GMT (envelope-from philip@FreeBSD.org)
Message-Id: <201909070513.x875DWNk016072@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: philip set sender to
 philip@FreeBSD.org using -f
From: Philip Paeps <philip@FreeBSD.org>
Date: Sat, 7 Sep 2019 05:13:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r351969 - in head/sys: kern riscv/conf
X-SVN-Group: head
X-SVN-Commit-Author: philip
X-SVN-Commit-Paths: in head/sys: kern riscv/conf
X-SVN-Commit-Revision: 351969
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.29
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: Sat, 07 Sep 2019 05:13:32 -0000

Author: philip
Date: Sat Sep  7 05:13:31 2019
New Revision: 351969
URL: https://svnweb.freebsd.org/changeset/base/351969

Log:
  riscv: restore default HZ=1000, keep QEMU at HZ=100
  
  This reverts r351918 and r351919.
  
  Discussed with:	br, ian, imp

Modified:
  head/sys/kern/subr_param.c
  head/sys/riscv/conf/QEMU

Modified: head/sys/kern/subr_param.c
==============================================================================
--- head/sys/kern/subr_param.c	Sat Sep  7 04:09:43 2019	(r351968)
+++ head/sys/kern/subr_param.c	Sat Sep  7 05:13:31 2019	(r351969)
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #ifndef HZ
-#  if defined(__mips__) || defined(__arm__) || defined(__riscv)
+#  if defined(__mips__) || defined(__arm__)
 #    define	HZ 100
 #  else
 #    define	HZ 1000

Modified: head/sys/riscv/conf/QEMU
==============================================================================
--- head/sys/riscv/conf/QEMU	Sat Sep  7 04:09:43 2019	(r351968)
+++ head/sys/riscv/conf/QEMU	Sat Sep  7 05:13:31 2019	(r351969)
@@ -6,4 +6,5 @@ include "GENERIC"
 
 ident QEMU
 
+options 	HZ=100
 options 	ROOTDEVNAME=\"ufs:/dev/vtbd0\"