From owner-svn-src-all@FreeBSD.ORG  Sat Dec 11 20:12:43 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3FE51106566B;
	Sat, 11 Dec 2010 20:12:43 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E7238FC14;
	Sat, 11 Dec 2010 20:12:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBBKChOE016759;
	Sat, 11 Dec 2010 20:12:43 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBBKChW5016757;
	Sat, 11 Dec 2010 20:12:43 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201012112012.oBBKChW5016757@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sat, 11 Dec 2010 20:12:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216382 - head/sys/i386/xen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Dec 2010 20:12:43 -0000

Author: cperciva
Date: Sat Dec 11 20:12:42 2010
New Revision: 216382
URL: http://svn.freebsd.org/changeset/base/216382

Log:
  Make the machdep.independent_wallclock sysctl do what it says on the box.

Modified:
  head/sys/i386/xen/clock.c

Modified: head/sys/i386/xen/clock.c
==============================================================================
--- head/sys/i386/xen/clock.c	Sat Dec 11 17:57:42 2010	(r216381)
+++ head/sys/i386/xen/clock.c	Sat Dec 11 20:12:42 2010	(r216382)
@@ -340,7 +340,8 @@ clkintr(void *arg)
 	 * time base.
 	 */
 	
-	if (shadow_tv_version != HYPERVISOR_shared_info->wc_version) {
+	if (shadow_tv_version != HYPERVISOR_shared_info->wc_version &&
+	    !independent_wallclock) {
 		printf("[XEN] hypervisor wallclock nudged; nudging TOD.\n");
 		update_wallclock();
 		add_uptime_to_wallclock();