From owner-p4-projects@FreeBSD.ORG  Tue May 11 22:45:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6985C16A4D0; Tue, 11 May 2004 22:45:02 -0700 (PDT)
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 3E91216A4CE
	for <perforce@freebsd.org>; Tue, 11 May 2004 22:45:02 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D25A743D2D
	for <perforce@freebsd.org>; Tue, 11 May 2004 22:45:01 -0700 (PDT)
	(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 i4C5j1Ge083847
	for <perforce@freebsd.org>; Tue, 11 May 2004 22:45:01 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4C5j15L083844
	for perforce@freebsd.org; Tue, 11 May 2004 22:45:01 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Tue, 11 May 2004 22:45:01 -0700 (PDT)
Message-Id: <200405120545.i4C5j15L083844@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 52707 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: Wed, 12 May 2004 05:45:02 -0000

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

Change 52707 by marcel@marcel_nfs on 2004/05/11 22:44:30

	Call kdb_reenter() instead of kdb_trap() when kdb_active is
	non-zero.  While here, make sure it's conditional upon KDB.

Affected files ...

.. //depot/projects/gdb/sys/alpha/alpha/trap.c#6 edit
.. //depot/projects/gdb/sys/amd64/amd64/trap.c#8 edit
.. //depot/projects/gdb/sys/i386/i386/trap.c#10 edit
.. //depot/projects/gdb/sys/ia64/ia64/trap.c#9 edit
.. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#6 edit

Differences ...

==== //depot/projects/gdb/sys/alpha/alpha/trap.c#6 (text+ko) ====

@@ -283,10 +283,12 @@
 #endif
 	p = td->td_proc;
 
+#ifdef KDB
 	if (kdb_active) {
-		kdb_trap(entry, a0, framep);
+		kdb_reenter();
 		return;
 	}
+#endif
 
 	td->td_last_frame = framep;
 

==== //depot/projects/gdb/sys/amd64/amd64/trap.c#8 (text+ko) ====

@@ -166,8 +166,8 @@
 	type = frame.tf_trapno;
 
 #ifdef KDB
-	if (kdb_active && type == T_PAGEFLT) {
-		kdb_trap(type, 0, &frame);
+	if (kdb_active) {
+		kdb_reenter();
 		goto out;
 	}
 #endif

==== //depot/projects/gdb/sys/i386/i386/trap.c#10 (text+ko) ====

@@ -188,7 +188,7 @@
 
 #ifdef KDB
 	if (kdb_active) {
-		kdb_trap(type, 0, &frame);
+		kdb_reenter();
 		goto out;
 	}
 #endif

==== //depot/projects/gdb/sys/ia64/ia64/trap.c#9 (text+ko) ====

@@ -373,8 +373,8 @@
 		KASSERT(cold || td->td_ucred != NULL,
 		    ("kernel trap doesn't have ucred"));
 #ifdef KDB
-		if (kdb_active && vector == IA64_VEC_PAGE_NOT_PRESENT)
-			kdb_trap(vector, 0, tf);
+		if (kdb_active)
+			kdb_reenter();
 #endif
 	}
 

==== //depot/projects/gdb/sys/sparc64/sparc64/trap.c#6 (text+ko) ====

@@ -298,11 +298,12 @@
 		KASSERT((tf->tf_type & T_KERNEL) != 0,
 		    ("trap: kernel trap isn't"));
 
+#ifdef KDB
 		if (kdb_active) {
-			kdb_trap(tf->tf_type, 0, tf);
-			TF_DONE(tf);
+			kdb_reenter();
 			return;
 		}
+#endif
 
 		td->td_last_frame = tf;