git: 8701571df9fa - main - set_cputicker: use a bool

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=8701571df9fad787f5833310cd696fe51e0cde6d

commit 8701571df9fad787f5833310cd696fe51e0cde6d
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-06-21 16:22:26 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2022-06-23 18:15:11 +0000

    set_cputicker: use a bool
    
    The third argument to this function indicates whether the supplied
    ticker is fixed or variable, i.e. requiring calibration. Give this
    argument a type and name that better conveys this purpose.
    
    Reviewed by:    kib, markj
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D35459
---
 sys/i386/i386/geode.c       | 2 +-
 sys/kern/kern_tc.c          | 6 +++---
 sys/powerpc/powerpc/clock.c | 2 +-
 sys/sys/systm.h             | 2 +-
 sys/x86/x86/tsc.c           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/i386/i386/geode.c b/sys/i386/i386/geode.c
index bef94a90629e..ee34c48157b0 100644
--- a/sys/i386/i386/geode.c
+++ b/sys/i386/i386/geode.c
@@ -291,7 +291,7 @@ geode_probe(device_t self)
 			tc_init(&geode_timecounter);
 			EVENTHANDLER_REGISTER(watchdog_list, geode_watchdog,
 			    NULL, 0);
-			set_cputicker(geode_cputicks, 27000000, 0);
+			set_cputicker(geode_cputicks, 27000000, false);
 		}
 		break;
 	case 0x0510100b:
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index fcdec7a58200..37287df4d1fd 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -2035,7 +2035,7 @@ SYSINIT(timecounter, SI_SUB_CLOCKS, SI_ORDER_SECOND, inittimecounter, NULL);
 
 /* Cpu tick handling -------------------------------------------------*/
 
-static int cpu_tick_variable;
+static bool cpu_tick_variable;
 static uint64_t	cpu_tick_frequency;
 
 DPCPU_DEFINE_STATIC(uint64_t, tc_cpu_ticks_base);
@@ -2128,14 +2128,14 @@ cpu_tick_calibrate(int reset)
 }
 
 void
-set_cputicker(cpu_tick_f *func, uint64_t freq, unsigned var)
+set_cputicker(cpu_tick_f *func, uint64_t freq, bool isvariable)
 {
 
 	if (func == NULL) {
 		cpu_ticks = tc_cpu_ticks;
 	} else {
 		cpu_tick_frequency = freq;
-		cpu_tick_variable = var;
+		cpu_tick_variable = isvariable;
 		cpu_ticks = func;
 	}
 }
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index a530d6c71a6b..46495108e5f1 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -190,7 +190,7 @@ decr_init(void)
 	ticks_per_sec = platform_timebase_freq(&cpu);
 	ps_per_tick = 1000000000000 / ticks_per_sec;
 
-	set_cputicker(mftb, ticks_per_sec, 0);
+	set_cputicker(mftb, ticks_per_sec, false);
 	snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu);
 	intrcnt_add(buf, &decr_counts[curcpu]);
 	decr_et_stop(NULL);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 98637c4f4838..f4b3421b76ba 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -407,7 +407,7 @@ int	getenv_array(const char *name, void *data, int size, int *psize,
 #define	GETENV_SIGNED	true	/* negative numbers allowed */
 
 typedef uint64_t (cpu_tick_f)(void);
-void set_cputicker(cpu_tick_f *func, uint64_t freq, unsigned var);
+void set_cputicker(cpu_tick_f *func, uint64_t freq, bool isvariable);
 extern cpu_tick_f *cpu_ticks;
 uint64_t cpu_tickrate(void);
 uint64_t cputick2usec(uint64_t tick);
diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c
index 96f209e4c08d..040e7ffcd3b8 100644
--- a/sys/x86/x86/tsc.c
+++ b/sys/x86/x86/tsc.c
@@ -846,7 +846,7 @@ tsc_levels_changed(void *arg, int unit)
 	error = CPUFREQ_LEVELS(cf_dev, levels, &count);
 	if (error == 0 && count != 0) {
 		max_freq = (uint64_t)levels[0].total_set.freq * 1000000;
-		set_cputicker(rdtsc, max_freq, 1);
+		set_cputicker(rdtsc, max_freq, true);
 	} else
 		printf("tsc_levels_changed: no max freq found\n");
 	free(levels, M_TEMP);