From owner-p4-projects@FreeBSD.ORG  Wed Mar 10 23:48:23 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A799B16A4D1; Wed, 10 Mar 2004 23:48:22 -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 8133C16A4CF
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 23:48:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 772EB43D45
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 23:48:22 -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 i2B7mMGe028499
	for <perforce@freebsd.org>; Wed, 10 Mar 2004 23:48:22 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2B7mMj5028496
	for perforce@freebsd.org; Wed, 10 Mar 2004 23:48:22 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Wed, 10 Mar 2004 23:48:22 -0800 (PST)
Message-Id: <200403110748.i2B7mMj5028496@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 48690 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: Thu, 11 Mar 2004 07:48:23 -0000

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

Change 48690 by marcel@marcel_nfs on 2004/03/10 23:48:02

	Add missing #include <sys/kdb.h> and fix initialization of
	KDB. LINT compiles on alpha.

Affected files ...

.. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#3 edit
.. //depot/projects/gdb/sys/alpha/alpha/machdep.c#4 edit
.. //depot/projects/gdb/sys/alpha/alpha/trap.c#3 edit

Differences ...

==== //depot/projects/gdb/sys/alpha/alpha/interrupt.c#3 (text+ko) ====

@@ -41,6 +41,7 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>

==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#4 (text+ko) ====

@@ -100,6 +100,7 @@
 #include <sys/systm.h>
 #include <sys/eventhandler.h>
 #include <sys/imgact.h>
+#include <sys/kdb.h>
 #include <sys/sysproto.h>
 #include <sys/ktr.h>
 #include <sys/signalvar.h>
@@ -1026,12 +1027,11 @@
 	/*
 	 * Initialize debuggers, and break into them if appropriate.
 	 */
-#ifdef DDB
 	kdb_init();
-	if (boothowto & RB_KDB) {
-		printf("Boot flags requested debugger\n");
-		breakpoint();
-	}
+
+#ifdef KDB
+	if (boothowto & RB_KDB)
+		kdb_enter("Boot flags requested debugger\n");
 #endif
 
 	/*

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

@@ -35,6 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kdb.h>
 #include <sys/ktr.h>
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
@@ -67,9 +68,6 @@
 #include <sys/ktrace.h>
 #endif
 
-#ifdef DDB
-#include <ddb/ddb.h>
-#endif
 #include <alpha/alpha/db_instruction.h>		/* for handle_opdec() */
 
 unsigned long	Sfloat_to_reg(unsigned int);
@@ -367,7 +365,7 @@
 		 * These are always fatal in kernel, and should never happen.
 		 */
 		if (!user) {
-#ifdef DDB
+#ifdef KDB
 			/*
 			 * ...unless, of course, DDB is configured; BUGCHK
 			 * is used to invoke the kernel debugger, and we