[src/trunk]: src/sys/arch/sparc64 "machine_model" is now declared in machine/...

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

details:   https://anonhg.NetBSD.org/src/rev/e01a62b63991
branches:  trunk
changeset: 791207:e01a62b63991
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Fri Nov 08 15:44:26 2013 +0000

description:
"machine_model" is now declared in machine/autoconf.h.

diffstat:

 sys/arch/sparc64/dev/psycho.c  |  5 ++---
 sys/arch/sparc64/sparc64/cpu.c |  5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 4ba0b2db68f0 -r e01a62b63991 sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Fri Nov 08 15:44:23 2013 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Fri Nov 08 15:44:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $ */
+/*     $NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $    */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.116 2013/09/24 18:23:07 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.117 2013/11/08 15:44:26 nakayama Exp $");
 
 #include "opt_ddb.h"
 
@@ -303,7 +303,6 @@
        int psycho_br[2], n, i;
        bus_space_handle_t pci_ctl;
        char *model = prom_getpropstring(ma->ma_node, "model");
-       extern char machine_model[];
 
        aprint_normal("\n");
 
diff -r 4ba0b2db68f0 -r e01a62b63991 sys/arch/sparc64/sparc64/cpu.c
--- a/sys/arch/sparc64/sparc64/cpu.c    Fri Nov 08 15:44:23 2013 +0000
+++ b/sys/arch/sparc64/sparc64/cpu.c    Fri Nov 08 15:44:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $ */
+/*     $NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.104 2013/08/20 19:19:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.105 2013/11/08 15:44:26 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -92,7 +92,6 @@
 char   machine[] = MACHINE;            /* from <machine/param.h> */
 char   machine_arch[] = MACHINE_ARCH;  /* from <machine/param.h> */
 char   cpu_model[100];                 /* machine model (primary CPU) */
-extern char machine_model[];
 
 /* These are used in locore.s, and are maximums */
 int    dcache_line_size;