From owner-p4-projects@FreeBSD.ORG  Fri Mar 11 22:27:37 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2790716A4D0; Fri, 11 Mar 2005 22:27:37 +0000 (GMT)
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 F3C1616A4CE
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 22:27:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D98E543D2D
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 22:27:36 +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 j2BMRagR049152
	for <perforce@freebsd.org>; Fri, 11 Mar 2005 22:27:36 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BMRa8E049149
	for perforce@freebsd.org; Fri, 11 Mar 2005 22:27:36 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 11 Mar 2005 22:27:36 GMT
Message-Id: <200503112227.j2BMRa8E049149@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>
Subject: PERFORCE change 72935 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 11 Mar 2005 22:27:38 -0000

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

Change 72935 by peter@peter_daintree on 2005/03/11 22:26:47

	integ -b i386_hammer (again)

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/critical.h#21 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#36 integrate

Differences ...

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


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

@@ -89,7 +89,6 @@
 
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
-
 int	adjkerntz;		/* local offset from GMT in seconds */
 int	clkintr_pending;
 int	disable_rtc_set;	/* disable resettodr() if != 0 */
@@ -155,7 +154,6 @@
 		hardclock(frame);
 }
 
-
 int
 acquire_timer2(int mode)
 {
@@ -176,7 +174,6 @@
 	return (0);
 }
 
-
 int
 release_timer2()
 {