From owner-p4-projects@FreeBSD.ORG  Fri Jan  6 06:20:13 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B50916A42B; Fri,  6 Jan 2006 06:20:12 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8AE016A429
	for <perforce@freebsd.org>; Fri,  6 Jan 2006 06:20:11 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D89D43D58
	for <perforce@freebsd.org>; Fri,  6 Jan 2006 06:20:11 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k066KBFQ082231
	for <perforce@freebsd.org>; Fri, 6 Jan 2006 06:20:11 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k066KB17082228
	for perforce@freebsd.org; Fri, 6 Jan 2006 06:20:11 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 6 Jan 2006 06:20:11 GMT
Message-Id: <200601060620.k066KB17082228@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89256 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2006 06:20:13 -0000

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)");