[src/trunk]: src/sys/arch/aarch64/aarch64 Avoid duplicate definition of ddb_r...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31bdbda99b10
branches:  trunk
changeset: 959236:31bdbda99b10
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Feb 05 21:44:34 2021 +0000

description:
Avoid duplicate definition of ddb_regs in crash(8).

diffstat:

 sys/arch/aarch64/aarch64/db_interface.c |  6 ++++--
 sys/arch/aarch64/aarch64/db_machdep.c   |  6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 67242c69cfe7 -r 31bdbda99b10 sys/arch/aarch64/aarch64/db_interface.c
--- a/sys/arch/aarch64/aarch64/db_interface.c   Fri Feb 05 21:43:20 2021 +0000
+++ b/sys/arch/aarch64/aarch64/db_interface.c   Fri Feb 05 21:44:34 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.11 2020/12/11 18:03:33 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.12 2021/02/05 21:44:34 joerg Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.11 2020/12/11 18:03:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.12 2021/02/05 21:44:34 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -51,6 +51,8 @@
 
 #include <dev/cons.h>
 
+db_regs_t ddb_regs;
+
 void
 db_read_bytes(vaddr_t addr, size_t size, char *data)
 {
diff -r 67242c69cfe7 -r 31bdbda99b10 sys/arch/aarch64/aarch64/db_machdep.c
--- a/sys/arch/aarch64/aarch64/db_machdep.c     Fri Feb 05 21:43:20 2021 +0000
+++ b/sys/arch/aarch64/aarch64/db_machdep.c     Fri Feb 05 21:44:34 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.32 2021/01/18 01:38:44 rin Exp $ */
+/* $NetBSD: db_machdep.c,v 1.33 2021/02/05 21:44:34 joerg Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.32 2021/01/18 01:38:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.33 2021/02/05 21:44:34 joerg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -207,9 +207,7 @@
 };
 
 const struct db_variable * const db_eregs = db_regs + __arraycount(db_regs);
-
 int db_active;
-db_regs_t ddb_regs;
 
 
 void