From owner-p4-projects@FreeBSD.ORG  Sun Mar 21 20:13:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D456F16A4D0; Sun, 21 Mar 2004 20:13:34 -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 AF61716A4CE
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 20:13:34 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7F5A43D2D
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 20:13:34 -0800 (PST)
	(envelope-from marcel@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 i2M4DYGe005063
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 20:13:34 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M4DYJe005060
	for perforce@freebsd.org; Sun, 21 Mar 2004 20:13:34 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Sun, 21 Mar 2004 20:13:34 -0800 (PST)
Message-Id: <200403220413.i2M4DYJe005060@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49507 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: Mon, 22 Mar 2004 04:13:35 -0000

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

Change 49507 by marcel@marcel_nfs on 2004/03/21 20:13:00

	Make sparc64 compile.

Affected files ...

.. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 edit
.. //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 edit

Differences ...

==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 (text+ko) ====

@@ -54,42 +54,11 @@
 static jmp_buf *db_nofault = 0;
 extern jmp_buf db_jmpbuf;
 
-int db_active;
-db_regs_t ddb_regs;
-
-#if 0
-static jmp_buf db_global_jmpbuf;
-static int db_global_jmpbuf_valid;
-
-int
-ddb_trap(struct trapframe *tf)
+void
+db_cpu_trap(int type, int dummy, struct trapframe *tf)
 {
-
-	if (db_global_jmpbuf_valid)
-		longjmp(db_global_jmpbuf, 1);
 	flushw();
-	ddb_regs = *tf;
-	critical_enter();
-	setjmp(db_global_jmpbuf);
-	db_global_jmpbuf_valid = TRUE;
-	atomic_add_acq_int(&db_active, 1);
-#ifdef SMP
-	stop_cpus(PCPU_GET(other_cpus));
-#endif
-	cndbctl(TRUE);
-	db_trap(tf->tf_type, 0);
-	cndbctl(FALSE);
-	db_active--;
-#ifdef SMP
-	restart_cpus(stopped_cpus);
-#endif
-	db_global_jmpbuf_valid = FALSE;
-	critical_exit();
-	*tf = ddb_regs;
-	TF_DONE(tf);
-	return (1);
 }
-#endif
 
 void
 db_read_bytes(vm_offset_t addr, size_t size, char *data)

==== //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 (text+ko) ====

@@ -55,11 +55,10 @@
  * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $
  */
 
-#include "opt_ddb.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/mutex.h>
@@ -76,8 +75,6 @@
 
 #include <dev/ofw/openfirm.h>
 
-#include <ddb/ddb.h>
-
 #include <machine/asi.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
@@ -446,8 +443,8 @@
 			return;
 	}
 	if (
-#ifdef DDB
-	    db_active ||
+#ifdef KDB
+	    kdb_active ||
 #endif
 	    panicstr != NULL)
 		printf("ipi_send: couldn't send ipi to module %u\n", mid);