Revert previous and move the prototype for db_alt_break to ddb.h.

Requested by:	bde (I think)

2 files changed, 4 insertions, 7 deletions

diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index ef43f68..d6ed76e 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -41,10 +41,8 @@
 #define BKPT_INST_TYPE int
 #endif
 
-struct vm_map;
-
 struct db_breakpoint {
-	struct vm_map *map;			/* in this map */
+	vm_map_t map;			/* in this map */
 	db_addr_t address;		/* set here */
 	int	init_count;		/* number of times to skip bkpt */
 	int	count;			/* current count */
@@ -66,8 +64,4 @@ void		db_set_breakpoints(void);
 db_breakpoint_t	db_set_temp_breakpoint(db_addr_t);
 #endif
 
-#ifdef ALT_BREAK_TO_DEBUGGER
-int		db_alt_break(int, int *);
-#endif
-
 #endif /* !_DDB_DB_BREAK_H_ */
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index cd8839b..3124c6e 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -79,6 +79,9 @@ extern db_expr_t db_tab_stop_width;
 
 struct vm_map;
 
+#ifdef ALT_BREAK_TO_DEBUGGER
+int		db_alt_break(int, int *);
+#endif
 void		db_check_interrupt(void);
 void		db_clear_watchpoints(void);
 db_addr_t	db_disasm(db_addr_t loc, boolean_t altfmt);