From owner-p4-projects@FreeBSD.ORG  Tue Nov 29 01:18:06 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 EDC3916A423; Tue, 29 Nov 2005 01:18:05 +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 C782116A41F
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 01:18:05 +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 86E6D43D55
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 01:18:05 +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 jAT1I5Wk042294
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 01:18:05 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAT1I5wD042291
	for perforce@freebsd.org; Tue, 29 Nov 2005 01:18:05 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 29 Nov 2005 01:18:05 GMT
Message-Id: <200511290118.jAT1I5wD042291@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 87405 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 01:18:06 -0000

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

Change 87405 by peter@peter_daintree on 2005/11/29 01:17:18

	So, there was no need to turn to use 3 files when 1 would do.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 edit
.. //depot/projects/hammer/sys/amd64/include/clock.h#18 edit
.. //depot/projects/hammer/sys/amd64/isa/clock.c#51 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#13 (text+ko) ====

@@ -128,15 +128,3 @@
 {
 	return (rdtsc());
 }
-
-void
-tsc_DELAY(int n)
-{
-	uint64_t start, end, now;
-
-	start = rdtsc();
-	end = start + (tsc_freq * n) / 1000000;
-	do {
-		now = rdtsc();
-	} while (now < end || (now > start && end < start));
-}

==== //depot/projects/hammer/sys/amd64/include/clock.h#18 (text+ko) ====

@@ -37,7 +37,6 @@
 int	sysbeep(int pitch, int period);
 void	init_TSC(void);
 void	init_TSC_tc(void);
-void	tsc_DELAY(int);
 
 #endif /* _KERNEL */
 

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

@@ -272,7 +272,13 @@
 #endif
 
 	if (tsc_freq != 0 && !tsc_is_broken) {
-		tsc_DELAY(n);
+		uint64_t start, end, now;
+
+		start = rdtsc();
+		end = start + (tsc_freq * n) / 1000000;
+		do {
+			now = rdtsc();
+		} while (now < end || (now > start && end < start));
 		return;
 	}
 #ifdef DELAYDEBUG