From: cheloha <cheloha@openbsd.org>
Date: Sat, 24 Feb 2024 01:43:32 +0000 (+0000)
Subject: clockintr: rename clockqueue_reset_intrclock to clockqueue_intrclock_reprogram
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2b39aa20af4373868cfffa12ffba65bebf61ce42;p=openbsd

clockintr: rename clockqueue_reset_intrclock to clockqueue_intrclock_reprogram

The function should be in the clockqueue_intrclock namespace.  Also,
"reprogram" is a better word for what the function actually does.
---

diff --git a/sys/kern/kern_clockintr.c b/sys/kern/kern_clockintr.c
index 1a36e497531..e7639dc7381 100644
--- a/sys/kern/kern_clockintr.c
+++ b/sys/kern/kern_clockintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clockintr.c,v 1.67 2024/02/12 22:07:33 cheloha Exp $ */
+/* $OpenBSD: kern_clockintr.c,v 1.68 2024/02/24 01:43:32 cheloha Exp $ */
 /*
  * Copyright (c) 2003 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -36,11 +36,11 @@ void clockintr_hardclock(struct clockrequest *, void *, void *);
 void clockintr_schedule_locked(struct clockintr *, uint64_t);
 void clockqueue_intrclock_install(struct clockintr_queue *,
     const struct intrclock *);
+void clockqueue_intrclock_reprogram(struct clockintr_queue *);
 uint64_t clockqueue_next(const struct clockintr_queue *);
 void clockqueue_pend_delete(struct clockintr_queue *, struct clockintr *);
 void clockqueue_pend_insert(struct clockintr_queue *, struct clockintr *,
     uint64_t);
-void clockqueue_reset_intrclock(struct clockintr_queue *);
 void intrclock_rearm(struct intrclock *, uint64_t);
 void intrclock_trigger(struct intrclock *);
 uint64_t nsec_advance(uint64_t *, uint64_t, uint64_t);
@@ -338,7 +338,7 @@ clockintr_cancel_locked(struct clockintr *cl)
 		if (ISSET(cq->cq_flags, CQ_INTRCLOCK)) {
 			if (was_next && !TAILQ_EMPTY(&cq->cq_pend)) {
 				if (cq == &curcpu()->ci_queue)
-					clockqueue_reset_intrclock(cq);
+					clockqueue_intrclock_reprogram(cq);
 			}
 		}
 	}
@@ -410,7 +410,7 @@ clockintr_schedule_locked(struct clockintr *cl, uint64_t expiration)
 	if (ISSET(cq->cq_flags, CQ_INTRCLOCK)) {
 		if (cl == TAILQ_FIRST(&cq->cq_pend)) {
 			if (cq == &curcpu()->ci_queue)
-				clockqueue_reset_intrclock(cq);
+				clockqueue_intrclock_reprogram(cq);
 		}
 	}
 	if (cl == cq->cq_running)
@@ -507,7 +507,7 @@ clockqueue_pend_insert(struct clockintr_queue *cq, struct clockintr *cl,
 }
 
 void
-clockqueue_reset_intrclock(struct clockintr_queue *cq)
+clockqueue_intrclock_reprogram(struct clockintr_queue *cq)
 {
 	uint64_t exp, now;