Page MenuHomeFreeBSD
Files F107849374

D19550.diff
No OneTemporary
Actions

D19550.diff
View Options

Index: head/sys/amd64/linux32/linux32_machdep.c
===================================================================
--- head/sys/amd64/linux32/linux32_machdep.c
+++ head/sys/amd64/linux32/linux32_machdep.c
@@ -674,8 +674,8 @@
error = copyout(&atv32, uap->tp, sizeof(atv32));
}
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);
Index: head/sys/compat/freebsd32/freebsd32_misc.c
===================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c
+++ head/sys/compat/freebsd32/freebsd32_misc.c
@@ -834,8 +834,8 @@
error = copyout(&atv32, uap->tp, sizeof (atv32));
}
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);
Index: head/sys/kern/kern_time.c
===================================================================
--- head/sys/kern/kern_time.c
+++ head/sys/kern/kern_time.c
@@ -660,8 +660,8 @@
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);
@@ -712,10 +712,6 @@
tv->tv_sec < 0)
return (EINVAL);
error = settime(td, tv);
- }
- if (tzp && error == 0) {
- tz_minuteswest = tzp->tz_minuteswest;
- tz_dsttime = tzp->tz_dsttime;
}
return (error);
}
Index: head/sys/kern/subr_clock.c
===================================================================
--- head/sys/kern/subr_clock.c
+++ head/sys/kern/subr_clock.c
@@ -52,9 +52,6 @@
#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 @@
utc_offset(void)
{
- return (tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0));
+ return (wall_cmos_clock ? adjkerntz : 0);
}
Index: head/sys/sys/clock.h
===================================================================
--- head/sys/sys/clock.h
+++ head/sys/sys/clock.h
@@ -51,12 +51,6 @@
#ifdef _KERNEL /* No user serviceable parts */
-/*
- * Timezone info from settimeofday(2), usually not used
- */
-extern int tz_minuteswest;
-extern int tz_dsttime;
-
int utc_offset(void);
/*

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 19, 5:22 PM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15900794
Default Alt Text
D19550.diff (2 KB)

Event Timeline