From owner-p4-projects@FreeBSD.ORG  Sat Mar 13 12:44:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9F9416A4D0; Sat, 13 Mar 2004 12:44:28 -0800 (PST)
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 B0E5F16A4CE
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 12:44:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 923F543D2F
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 12:44:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2DKiSGe036751
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 12:44:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DKiSDx036748
	for perforce@freebsd.org; Sat, 13 Mar 2004 12:44:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 13 Mar 2004 12:44:28 -0800 (PST)
Message-Id: <200403132044.i2DKiSDx036748@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 48910 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: Sat, 13 Mar 2004 20:44:29 -0000

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

Change 48910 by peter@peter_overcee on 2004/03/13 12:43:59

	fix merge breakage

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#8 edit

Differences ...

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

@@ -425,6 +425,7 @@
 	else
 #endif
 	{
+		bus_space_handle_t _port_ = bsh + offset;
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 		__asm __volatile("				\n\
 			cld					\n\