From: deraadt <deraadt@openbsd.org>
Date: Fri, 15 Sep 2023 11:48:48 +0000 (+0000)
Subject: work around cpu.h not coming into early scope on all arch
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=40ed92498b4bdedd47fb2083fbc233f6d080fe41;p=openbsd

work around cpu.h not coming into early scope on all arch
---

diff --git a/sys/kern/kern_clockintr.c b/sys/kern/kern_clockintr.c
index 11d44a93676..2f1efcbb871 100644
--- a/sys/kern/kern_clockintr.c
+++ b/sys/kern/kern_clockintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clockintr.c,v 1.52 2023/09/14 22:27:09 cheloha Exp $ */
+/* $OpenBSD: kern_clockintr.c,v 1.53 2023/09/15 11:48:49 deraadt Exp $ */
 /*
  * Copyright (c) 2003 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -355,9 +355,10 @@ clockintr_cancel(struct clockintr *cl)
 }
 
 struct clockintr *
-clockintr_establish(struct cpu_info *ci,
+clockintr_establish(void *vci,
     void (*func)(struct clockintr *, void *, void *), void *arg)
 {
+	struct cpu_info *ci = vci;
 	struct clockintr *cl;
 	struct clockintr_queue *cq = &ci->ci_queue;
 
diff --git a/sys/sys/clockintr.h b/sys/sys/clockintr.h
index 34eb2d22089..247457c4be4 100644
--- a/sys/sys/clockintr.h
+++ b/sys/sys/clockintr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockintr.h,v 1.16 2023/09/14 22:07:11 cheloha Exp $ */
+/* $OpenBSD: clockintr.h,v 1.17 2023/09/15 11:48:48 deraadt Exp $ */
 /*
  * Copyright (c) 2020-2022 Scott Cheloha <cheloha@openbsd.org>
  *
@@ -128,7 +128,7 @@ void clockintr_trigger(void);
 uint64_t clockintr_advance(struct clockintr *, uint64_t);
 uint64_t clockintr_advance_random(struct clockintr *, uint64_t, uint32_t);
 void clockintr_cancel(struct clockintr *);
-struct clockintr *clockintr_establish(struct cpu_info *,
+struct clockintr *clockintr_establish(void *,
     void (*)(struct clockintr *, void *, void *), void *);
 void clockintr_stagger(struct clockintr *, uint64_t, uint32_t, uint32_t);
 void clockqueue_init(struct clockintr_queue *);