From 7cfaf107872ed22ae1f9c20327bd5bf2b452848a Mon Sep 17 00:00:00 2001 From: cheloha Date: Thu, 14 Sep 2023 19:51:17 +0000 Subject: [PATCH] clockintr: move clockintr_advance_random() prototype into sys/clockintr.h statclock() is going to need this. Move the prototype into the public API. Thread: https://marc.info/?l=openbsd-tech&m=169428749720476&w=2 --- sys/kern/kern_clockintr.c | 3 +-- sys/sys/clockintr.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_clockintr.c b/sys/kern/kern_clockintr.c index ad92d10cddf..7c41b9d5fe4 100644 --- a/sys/kern/kern_clockintr.c +++ b/sys/kern/kern_clockintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clockintr.c,v 1.48 2023/09/14 19:39:47 cheloha Exp $ */ +/* $OpenBSD: kern_clockintr.c,v 1.49 2023/09/14 19:51:17 cheloha Exp $ */ /* * Copyright (c) 2003 Dale Rahn * Copyright (c) 2020 Mark Kettenis @@ -42,7 +42,6 @@ uint32_t statclock_avg; /* [I] average statclock period (ns) */ uint32_t statclock_min; /* [I] minimum statclock period (ns) */ uint32_t statclock_mask; /* [I] set of allowed offsets */ -uint64_t clockintr_advance_random(struct clockintr *, uint64_t, uint32_t); void clockintr_hardclock(struct clockintr *, void *, void *); void clockintr_schedule(struct clockintr *, uint64_t); void clockintr_schedule_locked(struct clockintr *, uint64_t); diff --git a/sys/sys/clockintr.h b/sys/sys/clockintr.h index 3de42b6d436..223e028471b 100644 --- a/sys/sys/clockintr.h +++ b/sys/sys/clockintr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clockintr.h,v 1.14 2023/09/14 19:39:47 cheloha Exp $ */ +/* $OpenBSD: clockintr.h,v 1.15 2023/09/14 19:51:18 cheloha Exp $ */ /* * Copyright (c) 2020-2022 Scott Cheloha * @@ -127,6 +127,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 *, void (*)(struct clockintr *, void *, void *), void *); -- 2.20.1