[rtems commit] Initialize timehands linkage much earlier.

[Jan Sommer]

Module:    rtems
Branch:    5
Commit:    bc9c0e00cca4b2f3d04a9e10b4fb698a842ebbeb
Changeset: http://git.rtems.org/rtems/commit/?id=bc9c0e00cca4b2f3d04a9e10b4fb698a842ebbeb

Author:    Konstantin Belousov <kib at FreeBSD.org>
Date:      Mon Sep  9 12:42:48 2019 +0000

Initialize timehands linkage much earlier.

Reported and tested by:	trasz
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week

---

 cpukit/score/src/kern_tc.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/cpukit/score/src/kern_tc.c b/cpukit/score/src/kern_tc.c
index 3aa68f7..0051d49 100644
--- a/cpukit/score/src/kern_tc.c
+++ b/cpukit/score/src/kern_tc.c
@@ -245,7 +245,8 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO, stepwarnings, CTLFLAG_RW,
     &timestepwarnings, 0, "Log time steps");
 
 static int timehands_count = 2;
-SYSCTL_INT(_kern_timecounter, OID_AUTO, timehands_count, CTLFLAG_RDTUN,
+SYSCTL_INT(_kern_timecounter, OID_AUTO, timehands_count,
+    CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &timehands_count, 0, "Count of timehands in rotation");
 
 struct bintime bt_timethreshold;
@@ -2242,12 +2243,30 @@ done:
 	return (0);
 }
 
+/* Set up the requested number of timehands. */
 static void
-inittimecounter(void *dummy)
+inittimehands(void *dummy)
 {
 	struct timehands *thp;
+	int i;
+
+	TUNABLE_INT_FETCH("kern.timecounter.timehands_count",
+	    &timehands_count);
+	if (timehands_count < 1)
+		timehands_count = 1;
+	if (timehands_count > nitems(ths))
+		timehands_count = nitems(ths);
+	for (i = 1, thp = &ths[0]; i < timehands_count;  thp = &ths[i++])
+		thp->th_next = &ths[i];
+	thp->th_next = &ths[0];
+}
+SYSINIT(timehands, SI_SUB_TUNABLES, SI_ORDER_ANY, inittimehands, NULL);
+
+static void
+inittimecounter(void *dummy)
+{
 	u_int p;
-	int i, tick_rate;
+	int tick_rate;
 
 	/*
 	 * Set the initial timeout to
@@ -2274,15 +2293,6 @@ inittimecounter(void *dummy)
 	ffclock_init();
 #endif
 
-	/* Set up the requested number of timehands. */
-	if (timehands_count < 1)
-		timehands_count = 1;
-	if (timehands_count > nitems(ths))
-		timehands_count = nitems(ths);
-	for (i = 1, thp = &ths[0]; i < timehands_count;  thp = &ths[i++])
-		thp->th_next = &ths[i];
-	thp->th_next = &ths[0];
-
 	/* warm up new timecounter (again) and get rolling. */
 	(void)timecounter->tc_get_timecount(timecounter);
 	(void)timecounter->tc_get_timecount(timecounter);