From owner-p4-projects@FreeBSD.ORG  Tue Apr 20 17:44:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B65B816A4D0; Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
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 74EF416A4CE
	for <perforce@freebsd.org>; Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6B75E43D48
	for <perforce@freebsd.org>; Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3L0i5Ge047856
	for <perforce@freebsd.org>; Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3L0i51T047853
	for perforce@freebsd.org; Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 20 Apr 2004 17:44:05 -0700 (PDT)
Message-Id: <200404210044.i3L0i51T047853@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 51492 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: Wed, 21 Apr 2004 00:44:06 -0000

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

Change 51492 by rwatson@rwatson_paprika on 2004/04/20 17:43:09

	Integrate netperf_socket:
	
	More ACPI cleanup.

Affected files ...

.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#16 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#16 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.140 2004/04/21 00:36:15 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.141 2004/04/21 00:38:54 njl Exp $
  */
 
 #include "opt_acpi.h"
@@ -1381,7 +1381,7 @@
     if (end >= start)
 	delta = end - start;
     else if (AcpiGbl_FADT->TmrValExt == 0)
-	delta = (((0x00FFFFFF - start) + end + 1) & 0x00FFFFFF);
+	delta = ((0x00FFFFFF - start) + end + 1) & 0x00FFFFFF;
     else
 	delta = ((0xFFFFFFFF - start) + end + 1);
     return (delta);