Module Name: src
Committed By: ozaki-r
Date: Tue Feb 13 04:11:28 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: db_interface.c
src/sys/arch/i386/i386: db_interface.c
Log Message:
Define ddb_regp only if MULTIPROCESSOR (NFC)
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/i386/i386/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/db_interface.c
diff -u src/sys/arch/amd64/amd64/db_interface.c:1.30 src/sys/arch/amd64/amd64/db_interface.c:1.31
--- src/sys/arch/amd64/amd64/db_interface.c:1.30 Tue Feb 13 04:10:41 2018
+++ src/sys/arch/amd64/amd64/db_interface.c Tue Feb 13 04:11:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.30 2018/02/13 04:10:41 ozaki-r Exp $ */
+/* $NetBSD: db_interface.c,v 1.31 2018/02/13 04:11:28 ozaki-r Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.30 2018/02/13 04:10:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.31 2018/02/13 04:11:28 ozaki-r Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -68,7 +68,9 @@ extern int trap_types;
int db_active = 0;
db_regs_t ddb_regs; /* register state */
+#ifdef MULTIPROCESSOR
db_regs_t *ddb_regp = NULL;
+#endif
void db_mach_cpu (db_expr_t, bool, db_expr_t, const char *);
@@ -244,7 +246,9 @@ kdb_trap(int type, int code, db_regs_t *
#endif
*regs = ddb_regs;
+#ifdef MULTIPROCESSOR
ddb_regp = NULL;
+#endif
return (1);
}
Index: src/sys/arch/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.79 src/sys/arch/i386/i386/db_interface.c:1.80
--- src/sys/arch/i386/i386/db_interface.c:1.79 Tue Feb 13 04:10:41 2018
+++ src/sys/arch/i386/i386/db_interface.c Tue Feb 13 04:11:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.79 2018/02/13 04:10:41 ozaki-r Exp $ */
+/* $NetBSD: db_interface.c,v 1.80 2018/02/13 04:11:28 ozaki-r Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.79 2018/02/13 04:10:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.80 2018/02/13 04:11:28 ozaki-r Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -73,7 +73,9 @@ extern int trap_types;
int db_active = 0;
db_regs_t ddb_regs; /* register state */
+#ifdef MULTIPROCESSOR
db_regs_t *ddb_regp = NULL;
+#endif
void db_mach_cpu (db_expr_t, bool, db_expr_t, const char *);
@@ -279,7 +281,9 @@ kdb_trap(int type, int code, db_regs_t *
regs->tf_ss = ddb_regs.tf_ss;
}
+#ifdef MULTIPROCESSOR
ddb_regp = NULL;
+#endif
return (1);
}
