Module Name: src
Committed By: maxv
Date: Tue Feb 13 06:44:13 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: db_interface.c
src/sys/arch/i386/i386: db_interface.c
Log Message:
Remove double declaration; 'ddb_regs' is already declared as a macro
in db_machdep.h if MULTIPROCESSOR is on, and the macro has higher
priority.
Don't declare 'ddb_regs' locally in this case, because it is misleading.
Part of PR/52964.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.80 -r1.81 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.31 src/sys/arch/amd64/amd64/db_interface.c:1.32
--- src/sys/arch/amd64/amd64/db_interface.c:1.31 Tue Feb 13 04:11:28 2018
+++ src/sys/arch/amd64/amd64/db_interface.c Tue Feb 13 06:44:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.31 2018/02/13 04:11:28 ozaki-r Exp $ */
+/* $NetBSD: db_interface.c,v 1.32 2018/02/13 06:44:13 maxv Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.31 2018/02/13 04:11:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.32 2018/02/13 06:44:13 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -67,9 +67,11 @@ extern const char *const trap_type[];
extern int trap_types;
int db_active = 0;
-db_regs_t ddb_regs; /* register state */
#ifdef MULTIPROCESSOR
+/* ddb_regs defined as a macro */
db_regs_t *ddb_regp = NULL;
+#else
+db_regs_t ddb_regs;
#endif
void db_mach_cpu (db_expr_t, bool, db_expr_t, const char *);
Index: src/sys/arch/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.80 src/sys/arch/i386/i386/db_interface.c:1.81
--- src/sys/arch/i386/i386/db_interface.c:1.80 Tue Feb 13 04:11:28 2018
+++ src/sys/arch/i386/i386/db_interface.c Tue Feb 13 06:44:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.80 2018/02/13 04:11:28 ozaki-r Exp $ */
+/* $NetBSD: db_interface.c,v 1.81 2018/02/13 06:44:13 maxv Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.80 2018/02/13 04:11:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.81 2018/02/13 06:44:13 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -72,9 +72,11 @@ extern const char *const trap_type[];
extern int trap_types;
int db_active = 0;
-db_regs_t ddb_regs; /* register state */
#ifdef MULTIPROCESSOR
+/* ddb_regs defined as a macro */
db_regs_t *ddb_regp = NULL;
+#else
+db_regs_t ddb_regs;
#endif
void db_mach_cpu (db_expr_t, bool, db_expr_t, const char *);
