From owner-p4-projects@FreeBSD.ORG  Mon Nov  3 16:55:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5562816A4D0; Mon,  3 Nov 2003 16:55:38 -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 2F84B16A4CE
	for <perforce@freebsd.org>; Mon,  3 Nov 2003 16:55:38 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ADD7A43F3F
	for <perforce@freebsd.org>; Mon,  3 Nov 2003 16:55:37 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA40tbXJ042489
	for <perforce@freebsd.org>; Mon, 3 Nov 2003 16:55:37 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA40tbZf042486
	for perforce@freebsd.org; Mon, 3 Nov 2003 16:55:37 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Mon, 3 Nov 2003 16:55:37 -0800 (PST)
Message-Id: <200311040055.hA40tbZf042486@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 41294 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: Tue, 04 Nov 2003 00:55:38 -0000

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

Change 41294 by peter@peter_daintree on 2003/11/03 16:54:37

	re-target source of smp_hammer branch

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/apicreg.h#4 integrate
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#4 integrate

Differences ...

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

@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/apic.h,v 1.24 2003/09/10 01:11:58 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $
  */
 
 #ifndef _MACHINE_APICREG_H_

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

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.76 2003/06/02 16:32:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.77 2003/11/03 21:10:17 jhb Exp $");
 
 #include "opt_mca.h"