From owner-p4-releng  Wed Nov 20  6:22:55 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8860F37B404; Wed, 20 Nov 2002 06:22:53 -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 5029D37B401
	for <perforce@freebsd.org>; Wed, 20 Nov 2002 06:22:53 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FFC943E42
	for <perforce@freebsd.org>; Wed, 20 Nov 2002 06:22:53 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAKEJomV076000
	for <perforce@freebsd.org>; Wed, 20 Nov 2002 06:19:50 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAKEJnJj075996
	for perforce@freebsd.org; Wed, 20 Nov 2002 06:19:49 -0800 (PST)
Date: Wed, 20 Nov 2002 06:19:49 -0800 (PST)
Message-Id: <200211201419.gAKEJnJj075996@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 21297 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

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

Change 21297 by jhb@jhb_laptop on 2002/11/20 06:19:33

	IFC: Fix sparc64 GENERIC compile.

Affected files ...

.. //depot/releng/5_dp2/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate

Differences ...

==== //depot/releng/5_dp2/src/sys/sparc64/sparc64/mp_machdep.c#4 (text+ko) ====

@@ -52,9 +52,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.16 2002/10/01 06:34:21 jake Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.17 2002/11/20 14:09:33 jhb Exp $
  */
 
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
@@ -455,7 +457,11 @@
 		if ((ldxa(0, ASI_INTR_DISPATCH_STATUS) & IDR_NACK) == 0)
 			return;
 	}
-	if (db_active || panicstr != NULL)
+	if (
+#ifdef DDB
+	    db_active ||
+#endif
+	    panicstr != NULL)
 		printf("ipi_send: couldn't send ipi to module %u\n", mid);
 	else
 		panic("ipi_send: couldn't send ipi");

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-releng" in the body of the message