Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
maxv 2018-02-13 06:44:13 +00:00
parent b549c2f1b5
commit 4770de59d1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/amd64/amd64/db_interface.c
View File

@ -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 *);

8
sys/arch/i386/i386/db_interface.c
View File

@ -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 *);