Date: Fri, 6 Jan 2006 06:20:11 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 89256 for review Message-ID: <200601060620.k066KB17082228@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=89256 Change 89256 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 06:19:12 add back in wall_cmos_clock sysctl to make complaining from adjkerntz go away Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#6 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#6 (text+ko) ==== @@ -109,6 +109,7 @@ #ifndef TIMER_FREQ #define TIMER_FREQ 1193182 #endif +int wall_cmos_clock; u_int timer_freq = TIMER_FREQ; struct mtx clock_lock; @@ -524,6 +525,7 @@ void inittodr(time_t base) { + unsigned long sec; int s, y; struct timespec ts; @@ -536,6 +538,8 @@ tc_setclock(&ts); } + sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + y = time_second - shadow_tv.tv_sec; if (y <= -2 || y >= 2) { /* badly off, adjust it */ ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#3 (text+ko) ==== @@ -1290,10 +1290,10 @@ SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, CTLFLAG_RD, &bootinfo, bootinfo, ""); -#ifndef XEN + SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); -#endif + u_long bootdev; /* not a struct cdev *- encoding is different */ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601060620.k066KB17082228>