sh, landisk: set HZ=64 again

The addition of HZ to sys/kernel.h in v1.26 overrides the default
definition of HZ in sh/clock.c, changing landisk from HZ=64 to HZ=100.

Explicitly set HZ=64 in the GENERIC and RAMDISK config(8) files to can
change it from 100 back to 64.

Not sure if this is the best thing, but it does fix the problem.

Problem confirmed by, and fix tested by, miod@.

ok miod@

diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index f562c23..ba2f0f6 100644 (file)
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.59 2021/08/22 06:26:28 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.60 2023/03/12 22:18:58 cheloha Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -13,6 +13,8 @@ machine               landisk sh
 include                "../../../conf/GENERIC"
 maxusers       32                      # estimated number of users
 
+option         HZ=64
+
 option         SH4                     # processor family; MANDATORY
 option                 SH7751R                 # processor type; MANDATORY
 

diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK
index c35cae0..6ec99f1 100644 (file)
--- a/sys/arch/landisk/conf/RAMDISK
+++ b/sys/arch/landisk/conf/RAMDISK
@@ -1,8 +1,10 @@
-#      $OpenBSD: RAMDISK,v 1.27 2020/03/27 14:34:51 otto Exp $
+#      $OpenBSD: RAMDISK,v 1.28 2023/03/12 22:18:58 cheloha Exp $
 
 machine                landisk sh
 maxusers       4
 
+option         HZ=64
+
 option         SMALL_KERNEL
 option         NO_PROPOLICE
 option         BOOT_CONFIG

diff --git a/sys/arch/sh/sh/clock.c b/sys/arch/sh/sh/clock.c
index ea9cfa3..2f6bc79 100644 (file)
--- a/sys/arch/sh/sh/clock.c
+++ b/sys/arch/sh/sh/clock.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clock.c,v 1.12 2022/12/06 01:19:35 cheloha Exp $      */
+/*     $OpenBSD: clock.c,v 1.13 2023/03/12 22:18:58 cheloha Exp $      */
 /*     $NetBSD: clock.c,v 1.32 2006/09/05 11:09:36 uwe Exp $   */
 
 /*-
@@ -48,9 +48,6 @@
 
 #define        NWDOG 0
 
-#ifndef HZ
-#define        HZ              64
-#endif
 #define        MINYEAR         2002    /* "today" */
 #define        SH_RTC_CLOCK    16384   /* Hz */
 
@@ -258,7 +255,6 @@ cpu_initclocks(void)
                panic("No PCLOCK information.");
 
        /* Set global variables. */
-       hz = HZ;
        tick = 1000000 / hz;
        tick_nsec = 1000000000 / hz;