From owner-p4-projects@FreeBSD.ORG  Mon Nov  7 19:49:49 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 9D24116A421; Mon,  7 Nov 2005 19:49:48 +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 74D6C16A41F
	for <perforce@freebsd.org>; Mon,  7 Nov 2005 19:49:48 +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 4349243D45
	for <perforce@freebsd.org>; Mon,  7 Nov 2005 19:49:48 +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 jA7JnmHD014900
	for <perforce@freebsd.org>; Mon, 7 Nov 2005 19:49:48 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA7Jnlcx014897
	for perforce@freebsd.org; Mon, 7 Nov 2005 19:49:47 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 7 Nov 2005 19:49:47 GMT
Message-Id: <200511071949.jA7Jnlcx014897@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 86435 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: Mon, 07 Nov 2005 19:49:49 -0000

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

Change 86435 by peter@peter_daintree on 2005/11/07 19:49:21

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/trap.c#80 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#83 integrate
.. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#80 (text+ko) ====

@@ -167,6 +167,7 @@
 	PCPU_LAZY_INC(cnt.v_trap);
 	type = frame.tf_trapno;
 
+#ifdef SMP
 #ifdef STOP_NMI
 	/* Handler for NMI IPIs used for stopping CPUs. */
 	if (type == T_NMI) {
@@ -174,6 +175,7 @@
 	                   goto out;
 	}
 #endif /* STOP_NMI */
+#endif /* SMP */
 
 #ifdef KDB
 	if (kdb_active) {

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#83 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#22 (text+ko) ====