svn commit: r351969 - in head/sys: kern riscv/conf

[Philip Paeps]

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\"