aboutsummaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_time.c8
-rw-r--r--sys/kern/subr_clock.c5
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 3b6b42b64b31..b8423768ccdf 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -660,8 +660,8 @@ sys_gettimeofday(struct thread *td, struct gettimeofday_args *uap)
error = copyout(&atv, uap->tp, sizeof (atv));
}
if (error == 0 && uap->tzp != NULL) {
- rtz.tz_minuteswest = tz_minuteswest;
- rtz.tz_dsttime = tz_dsttime;
+ rtz.tz_minuteswest = 0;
+ rtz.tz_dsttime = 0;
error = copyout(&rtz, uap->tzp, sizeof (rtz));
}
return (error);
@@ -713,10 +713,6 @@ kern_settimeofday(struct thread *td, struct timeval *tv, struct timezone *tzp)
return (EINVAL);
error = settime(td, tv);
}
- if (tzp && error == 0) {
- tz_minuteswest = tzp->tz_minuteswest;
- tz_dsttime = tzp->tz_dsttime;
- }
return (error);
}
diff --git a/sys/kern/subr_clock.c b/sys/kern/subr_clock.c
index fa72e5425d1f..e3a427c49a63 100644
--- a/sys/kern/subr_clock.c
+++ b/sys/kern/subr_clock.c
@@ -52,9 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/timetc.h>
-int tz_minuteswest;
-int tz_dsttime;
-
/*
* The adjkerntz and wall_cmos_clock sysctls are in the "machdep" sysctl
* namespace because they were misplaced there originally.
@@ -386,5 +383,5 @@ int
utc_offset(void)
{
- return (tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0));
+ return (wall_cmos_clock ? adjkerntz : 0);
}