Split the global timezone structure into two integer fields to

prevent the compiler from optimizing assignments into byte-copy
operations which might make access to the individual fields non-atomic.

Use the individual fields throughout, and don't bother locking them with
Giant: it is no longer needed.

Inspired by:    tjr

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/kern/subr_rtc.c b/sys/kern/subr_rtc.c
index e573463..19df90d 100644
--- a/sys/kern/subr_rtc.c
+++ b/sys/kern/subr_rtc.c
@@ -281,7 +281,7 @@ inittodr(time_t base)
 		printf("Check and reset the date immediately!\n");
 	}
 
-	ts.tv_sec += tz.tz_minuteswest * 60 +
+	ts.tv_sec += tz_minuteswest * 60 +
 	    (wall_cmos_clock ? adjkerntz : 0);
 
 	if (timespeccmp(&ref, &ts, >)) {
@@ -310,7 +310,7 @@ resettodr()
 		return;
 
 	getnanotime(&ts);
-	ts.tv_sec -= tz.tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0);
+	ts.tv_sec -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0);
 	if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) {
 		printf("warning: clock_settime failed (%d), time-of-day clock "
 		    "not adjusted to system time\n", error);