From owner-p4-projects@FreeBSD.ORG  Tue Nov 29 21:48:58 2005
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 C770916A427; Tue, 29 Nov 2005 21:48:57 +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 62A2316A420
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 21:48:57 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9BC2E43D80
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 21:48:56 +0000 (GMT)
	(envelope-from peter@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 jATLmpwg049521
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 21:48:51 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATLmpTD049518
	for perforce@freebsd.org; Tue, 29 Nov 2005 21:48:51 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 29 Nov 2005 21:48:51 GMT
Message-Id: <200511292148.jATLmpTD049518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87476 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: Tue, 29 Nov 2005 21:48:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=87476

Change 87476 by peter@peter_melody on 2005/11/29 21:48:37

	Handle wraparound, in case we happen to be doing a DELAY as we cross
	an uptime of about 140 years on a 2GHz machine.  One can never be too
	safe! :-)

Affected files ...

.. //depot/projects/hammer/sys/amd64/isa/clock.c#53 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/isa/clock.c#53 (text+ko) ====

@@ -280,7 +280,7 @@
 		end = start + (tsc_freq * n) / 1000000;
 		do {
 			now = rdtsc();
-		} while (now < end);
+		} while (now < end || (now > start && end < start));
 		sched_unpin();
 		return;
 	}