[src/trunk]: src/sys/arch/sparc64/sparc64 Avoid declaring autoconf_debug twic...

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

details:   https://anonhg.NetBSD.org/src/rev/d193641d8baa
branches:  trunk
changeset: 955922:d193641d8baa
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sat Oct 17 08:10:31 2020 +0000

description:
Avoid declaring autoconf_debug twice when building with DEBUG.
Pointed out by palle@ - thanks!

diffstat:

 sys/arch/sparc64/sparc64/autoconf.c  |  6 ++++--
 sys/arch/sparc64/sparc64/ofw_patch.h |  4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 6131cd863e82 -r d193641d8baa sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Sat Oct 17 07:41:25 2020 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Sat Oct 17 08:10:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.224 2020/10/16 07:35:16 jdc Exp $ */
+/*     $NetBSD: autoconf.c,v 1.225 2020/10/17 08:10:31 jdc Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.224 2020/10/16 07:35:16 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.225 2020/10/17 08:10:31 jdc Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -116,6 +116,8 @@
 
 #include "ksyms.h"
 
+int autoconf_debug = 0x0;
+
 struct evcnt intr_evcnts[] = {
        EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "intr", "spur"),
        EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "intr", "lev1"),
diff -r 6131cd863e82 -r d193641d8baa sys/arch/sparc64/sparc64/ofw_patch.h
--- a/sys/arch/sparc64/sparc64/ofw_patch.h      Sat Oct 17 07:41:25 2020 +0000
+++ b/sys/arch/sparc64/sparc64/ofw_patch.h      Sat Oct 17 08:10:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw_patch.h,v 1.1 2020/10/16 07:35:16 jdc Exp $ */
+/*     $NetBSD: ofw_patch.h,v 1.2 2020/10/17 08:10:31 jdc Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #define ACDB_BOOTDEV    0x1
 #define ACDB_PROBE      0x2
 #define ACDB_BOOTARGS   0x4
-int autoconf_debug = 0x0;
+extern int autoconf_debug;
 #define DPRINTF(l, s)   do { if (autoconf_debug & l) printf s; } while (0)
 #else
 #define DPRINTF(l, s)