From e2fb7a7be0c688b7b4bdce276aa105e6839bc4d7 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 10 Jul 2004 21:21:13 +0000
Subject: [PATCH] Update for the KDB framework: o  Call kdb_enter() instead of
 Debugger().

---
 sys/dev/vinum/vinumhdr.h       | 1 +
 sys/dev/vinum/vinuminterrupt.c | 2 +-
 sys/dev/vinum/vinumioctl.c     | 2 +-
 sys/dev/vinum/vinummemory.c    | 4 ++--
 sys/fs/smbfs/smbfs_node.c      | 7 ++++---
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index e8161e81e06..41178212420 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -44,6 +44,7 @@
 #ifdef _KERNEL
 #include "opt_vinum.h"
 #include <sys/systm.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 7344280ae9a..d031ef938fb 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -210,7 +210,7 @@ complete_rqe(struct buf *bp)
 #ifdef VINUMDEBUG
 	if (debug & DEBUG_RESID) {
 	    if (ubp->b_resid != 0)			    /* still something to transfer? */
-		Debugger("resid");
+		kdb_enter("resid");
 	}
 #endif
 
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 1783c923450..235b125d7e6 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -201,7 +201,7 @@ vinum_super_ioctl(struct cdev *dev,
 		boothowto |= RB_GDB;			    /* serial debug line */
 	    else
 		boothowto &= ~RB_GDB;			    /* local ddb */
-	    Debugger("vinum debug");
+	    kdb_enter("vinum debug");
 	}
 	ioctl_reply = (struct _ioctl_reply *) data;	    /* reinstate the address to reply to */
 	ioctl_reply->error = 0;
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 62c573d550a..ef8a541bb76 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -175,7 +175,7 @@ MMalloc(int size, char *file, int line)
 	for (i = 0; i < malloccount; i++) {
 	    if (((result + size) > malloced[i].address)
 		&& (result < malloced[i].address + malloced[i].size)) /* overlap */
-		Debugger("Malloc overlap");
+		kdb_enter("Malloc overlap");
 	}
 	if (result) {
 	    char *f = basename(file);
@@ -238,7 +238,7 @@ FFree(void *mem, char *file, int line)
 	mem,
 	file,
 	line);
-    Debugger("Free");
+    kdb_enter("Free");
 }
 
 void
diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c
index 830e1e504da..c76d73e8c05 100644
--- a/sys/fs/smbfs/smbfs_node.c
+++ b/sys/fs/smbfs/smbfs_node.c
@@ -33,6 +33,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
@@ -140,7 +141,7 @@ smbfs_name_free(u_char *name)
 	cp--;
 	if (*cp != 0xfc) {
 		printf("First byte of name entry '%s' corrupted\n", name);
-		Debugger("ditto");
+		kdb_enter("ditto");
 	}
 	cp -= sizeof(int);
 	nmlen = *(int*)cp;
@@ -148,11 +149,11 @@ smbfs_name_free(u_char *name)
 	if (nmlen != slen) {
 		printf("Name length mismatch: was %d, now %d name '%s'\n",
 		    nmlen, slen, name);
-		Debugger("ditto");
+		kdb_enter("ditto");
 	}
 	if (name[nmlen] != 0xfe) {
 		printf("Last byte of name entry '%s' corrupted\n", name);
-		Debugger("ditto");
+		kdb_enter("ditto");
 	}
 	free(cp, M_SMBNODENAME);
 #else