From dfaeb4bfd65c52fc48229e52b6fe21c79b43dfd9 Mon Sep 17 00:00:00 2001
From: cheloha <cheloha@openbsd.org>
Date: Tue, 17 Jan 2023 02:27:14 +0000
Subject: [PATCH] arm, armv7: add clockintr support

The interrupt clock drivers need these pieces to be in place first.

ok mlarkin@ kettenis@
---
 sys/arch/arm/include/_types.h | 4 +++-
 sys/arch/arm/include/cpu.h    | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index 10703b36b4a..f107abc601c 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.19 2018/03/05 01:15:25 deraadt Exp $	*/
+/*	$OpenBSD: _types.h,v 1.20 2023/01/17 02:27:14 cheloha Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -35,6 +35,8 @@
 #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/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index e3b6d5cfe8e..7f6b95ccf92 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.61 2021/07/06 09:34:06 kettenis Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.62 2023/01/17 02:27:14 cheloha Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -149,6 +149,7 @@ void	arm32_vector_init(vaddr_t, int);
  * Per-CPU information.  For now we assume one CPU.
  */
 
+#include <sys/clockintr.h>
 #include <sys/device.h>
 #include <sys/sched.h>
 #include <sys/srp.h>
@@ -198,7 +199,7 @@ struct cpu_info {
 #ifdef GPROF
 	struct gmonparam *ci_gmon;
 #endif
-
+	struct clockintr_queue	ci_queue;
 	char			ci_panicbuf[512];
 };
 
-- 
2.20.1