summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorScott Soule Cheloha <cheloha@cvs.openbsd.org>2023-07-02 19:02:29 +0000
committerScott Soule Cheloha <cheloha@cvs.openbsd.org>2023-07-02 19:02:29 +0000
commit6ab04ff568e8500392a500a635857450d6d69369 (patch)
tree646c660f0fd9a491e1982c9773d599ff35abdfab /sys/arch
parent4fd9808494c2101f7ad6f8d4e93f9187c9ce65da (diff)
all platforms, kernel: remove __HAVE_CLOCKINTR symbol
Every platform made the clockintr switch at least six months ago. The __HAVE_CLOCKINTR symbol is now redundant. Remove it. Prompted by claudio@. Link: https://marc.info/?l=openbsd-tech&m=168826181015032&w=2 "makes sense" mlarkin@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/include/_types.h4
-rw-r--r--sys/arch/amd64/include/_types.h4
-rw-r--r--sys/arch/arm/include/_types.h4
-rw-r--r--sys/arch/arm64/include/_types.h4
-rw-r--r--sys/arch/hppa/include/_types.h4
-rw-r--r--sys/arch/i386/i386/apm.c4
-rw-r--r--sys/arch/i386/include/_types.h4
-rw-r--r--sys/arch/loongson/dev/apm.c4
-rw-r--r--sys/arch/m88k/include/_types.h4
-rw-r--r--sys/arch/mips64/include/_types.h4
-rw-r--r--sys/arch/powerpc/include/_types.h4
-rw-r--r--sys/arch/powerpc64/include/_types.h4
-rw-r--r--sys/arch/riscv64/include/_types.h4
-rw-r--r--sys/arch/sh/include/_types.h4
-rw-r--r--sys/arch/sparc64/include/_types.h4
15 files changed, 15 insertions, 45 deletions
diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h
index 129259bf070..a2ff372b4dc 100644
--- a/sys/arch/alpha/include/_types.h
+++ b/sys/arch/alpha/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.25 2022/12/10 15:02:29 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.26 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[10];
diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h
index a9445bb4d93..9856177da81 100644
--- a/sys/arch/amd64/include/_types.h
+++ b/sys/arch/amd64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.18 2022/11/08 17:34:13 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.19 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
/*
* _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
* value for all data types (int, long, ...). The result is an
diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index f107abc601c..71043162186 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.20 2023/01/17 02:27:14 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.21 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _ARM__TYPES_H_
#define _ARM__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[11];
diff --git a/sys/arch/arm64/include/_types.h b/sys/arch/arm64/include/_types.h
index 6d4c4aaa0fb..9661d1e2b20 100644
--- a/sys/arch/arm64/include/_types.h
+++ b/sys/arch/arm64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.5 2022/11/08 17:56:38 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.6 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,8 +34,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[13];
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index 80d46e03d95..1a7a8799fdb 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.27 2022/12/06 00:40:09 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.28 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[19];
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 018185e8734..80abd4408f6 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.131 2023/06/22 13:18:02 claudio Exp $ */
+/* $OpenBSD: apm.c,v 1.132 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -265,10 +265,8 @@ apm_suspend(int state)
rtcstart(); /* in i8254 mode, rtc is profclock */
inittodr(gettime());
-#ifdef __HAVE_CLOCKINTR
clockintr_cpu_init(NULL);
clockintr_trigger();
-#endif
config_suspend_all(DVACT_RESUME);
cold = 0;
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index 2ccf99a07c5..d879b02fee2 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.24 2022/12/06 01:56:44 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.25 2023/07/02 19:02:27 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
/*
* _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
* value for all data types (int, long, ...). The result is an
diff --git a/sys/arch/loongson/dev/apm.c b/sys/arch/loongson/dev/apm.c
index 984c2aeb75b..7ac620ab239 100644
--- a/sys/arch/loongson/dev/apm.c
+++ b/sys/arch/loongson/dev/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.42 2023/02/10 14:34:16 visa Exp $ */
+/* $OpenBSD: apm.c,v 1.43 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 2001 Alexander Guy. All rights reserved.
@@ -418,10 +418,8 @@ apm_suspend(int state)
}
inittodr(gettime()); /* Move the clock forward */
-#ifdef __HAVE_CLOCKINTR
clockintr_cpu_init(NULL);
clockintr_trigger();
-#endif
config_suspend_all(DVACT_RESUME);
diff --git a/sys/arch/m88k/include/_types.h b/sys/arch/m88k/include/_types.h
index 5527be96aa6..a8a53df0bf4 100644
--- a/sys/arch/m88k/include/_types.h
+++ b/sys/arch/m88k/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.19 2022/12/06 00:56:52 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.20 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _M88K__TYPES_H_
#define _M88K__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[19];
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h
index 535abead1de..87e43ebeefe 100644
--- a/sys/arch/mips64/include/_types.h
+++ b/sys/arch/mips64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.24 2022/11/19 16:23:48 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.25 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MIPS64__TYPES_H_
#define _MIPS64__TYPES_H_
-#define __HAVE_CLOCKINTR
-
/*
* _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
* value for all data types (int, long, ...). The result is an
diff --git a/sys/arch/powerpc/include/_types.h b/sys/arch/powerpc/include/_types.h
index 1cfd400c153..001c5c7d37e 100644
--- a/sys/arch/powerpc/include/_types.h
+++ b/sys/arch/powerpc/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.24 2022/11/29 00:58:05 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.25 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _POWERPC__TYPES_H_
#define _POWERPC__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[25];
diff --git a/sys/arch/powerpc64/include/_types.h b/sys/arch/powerpc64/include/_types.h
index 63fd7c9c63b..7306803d303 100644
--- a/sys/arch/powerpc64/include/_types.h
+++ b/sys/arch/powerpc64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.3 2022/11/29 01:04:44 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.4 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,8 +34,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[22];
diff --git a/sys/arch/riscv64/include/_types.h b/sys/arch/riscv64/include/_types.h
index 0704283275d..6a106c61ffc 100644
--- a/sys/arch/riscv64/include/_types.h
+++ b/sys/arch/riscv64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.4 2022/11/19 16:02:37 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.5 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[14];
diff --git a/sys/arch/sh/include/_types.h b/sys/arch/sh/include/_types.h
index 7a75ef6de95..9308f2f3a46 100644
--- a/sys/arch/sh/include/_types.h
+++ b/sys/arch/sh/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.21 2022/12/06 01:19:35 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.22 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _SH__TYPES_H_
#define _SH__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[9];
diff --git a/sys/arch/sparc64/include/_types.h b/sys/arch/sparc64/include/_types.h
index e3e37a5c357..fbf0e66d46c 100644
--- a/sys/arch/sparc64/include/_types.h
+++ b/sys/arch/sparc64/include/_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: _types.h,v 1.24 2023/01/13 03:22:18 cheloha Exp $ */
+/* $OpenBSD: _types.h,v 1.25 2023/07/02 19:02:28 cheloha Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,6 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
-#define __HAVE_CLOCKINTR
-
#if defined(_KERNEL)
typedef struct label_t {
long val[2];