summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2007-11-14 17:52:37 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2007-11-14 17:52:37 +0000
commit6a1c56fcde536e30ab84f9f5c9fe45e8afadab21 (patch)
tree1a834eda73a53bf8cc18c515d7def6d743fd0507
parentd17d7c78a5e03bf637f4a78d847170a7315ca4bf (diff)
Be consistent in db_cmd_loop_done declaration.
-rw-r--r--sys/arch/amd64/amd64/db_interface.c4
-rw-r--r--sys/arch/i386/i386/db_interface.c4
-rw-r--r--sys/ddb/db_command.c4
-rw-r--r--sys/ddb/db_run.c4
-rw-r--r--sys/ddb/db_run.h3
5 files changed, 9 insertions, 10 deletions
diff --git a/sys/arch/amd64/amd64/db_interface.c b/sys/arch/amd64/amd64/db_interface.c
index 3d8ed9195a8..7926f3c8ad4 100644
--- a/sys/arch/amd64/amd64/db_interface.c
+++ b/sys/arch/amd64/amd64/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.11 2007/01/15 23:19:05 jsg Exp $ */
+/* $OpenBSD: db_interface.c,v 1.12 2007/11/14 17:52:35 miod Exp $ */
/* $NetBSD: db_interface.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */
/*
@@ -54,6 +54,7 @@
#include <ddb/db_extern.h>
#include <ddb/db_access.h>
#include <ddb/db_output.h>
+#include <ddb/db_run.h>
#include <ddb/db_var.h>
#include "acpi.h"
@@ -64,7 +65,6 @@
extern label_t *db_recover;
extern char *trap_type[];
extern int trap_types;
-extern boolean_t db_cmd_loop_done;
#ifdef MULTIPROCESSOR
struct mutex ddb_mp_mutex = MUTEX_INITIALIZER(IPL_HIGH);
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 4119ff4a0b4..a929e362c7c 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.23 2006/11/29 22:40:13 miod Exp $ */
+/* $OpenBSD: db_interface.c,v 1.24 2007/11/14 17:52:36 miod Exp $ */
/* $NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $ */
/*
@@ -49,6 +49,7 @@
#include <ddb/db_extern.h>
#include <ddb/db_access.h>
#include <ddb/db_output.h>
+#include <ddb/db_run.h>
#include <ddb/db_var.h>
#include "acpi.h"
@@ -59,7 +60,6 @@
extern label_t *db_recover;
extern char *trap_type[];
extern int trap_types;
-extern boolean_t db_cmd_loop_done;
#ifdef MULTIPROCESSOR
extern volatile int ddb_state;
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index bd91d46ae82..9eb3bf028cf 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_command.c,v 1.47 2007/11/05 19:23:24 miod Exp $ */
+/* $OpenBSD: db_command.c,v 1.48 2007/11/14 17:52:36 miod Exp $ */
/* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */
/*
@@ -58,7 +58,7 @@
/*
* Exported global variables
*/
-boolean_t db_cmd_loop_done;
+int db_cmd_loop_done;
label_t *db_recover;
/*
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index e247f4c411b..178baf4561b 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_run.c,v 1.19 2006/03/13 06:23:20 jsg Exp $ */
+/* $OpenBSD: db_run.c,v 1.20 2007/11/14 17:52:36 miod Exp $ */
/* $NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $ */
/*
@@ -234,8 +234,6 @@ db_single_step(db_regs_t *regs)
}
}
-extern int db_cmd_loop_done;
-
/* single-step */
/*ARGSUSED*/
void
diff --git a/sys/ddb/db_run.h b/sys/ddb/db_run.h
index e9fcca75da5..16a31980e01 100644
--- a/sys/ddb/db_run.h
+++ b/sys/ddb/db_run.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_run.h,v 1.8 2003/02/12 14:41:07 jason Exp $ */
+/* $OpenBSD: db_run.h,v 1.9 2007/11/14 17:52:36 miod Exp $ */
/* $NetBSD: db_run.h,v 1.3 1996/02/05 01:57:14 christos Exp $ */
/*
@@ -39,6 +39,7 @@
extern int db_inst_count;
extern int db_load_count;
extern int db_store_count;
+extern int db_cmd_loop_done;
boolean_t db_stop_at_pc(db_regs_t *, boolean_t *);
void db_restart_at_pc(db_regs_t *, boolean_t);