> Still uses uint instead of u_int in places. Still has the pointless > extra NULL and 0 for timecounters in files that are otherwise
If you don't like uint, then let's fix what's in the tree in amd64 (which is how uint got used in my diff too). OK? diff --git sys/arch/amd64/amd64/tsc.c sys/arch/amd64/amd64/tsc.c index 7a1dcb4ad75..25c98180852 100644 --- sys/arch/amd64/amd64/tsc.c +++ sys/arch/amd64/amd64/tsc.c @@ -42,7 +42,7 @@ int64_t tsc_drift_observed; volatile int64_t tsc_sync_val; volatile struct cpu_info *tsc_sync_cpu; -uint tsc_get_timecount(struct timecounter *tc); +u_int tsc_get_timecount(struct timecounter *tc); #include "lapic.h" #if NLAPIC > 0 @@ -207,7 +207,7 @@ cpu_recalibrate_tsc(struct timecounter *tc) calibrate_tsc_freq(); } -uint +u_int tsc_get_timecount(struct timecounter *tc) { return rdtsc() + curcpu()->ci_tsc_skew;