Module Name: src
Committed By: nakayama
Date: Fri Nov 8 15:44:26 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: psycho.c
src/sys/arch/sparc64/sparc64: cpu.c
Log Message:
"machine_model" is now declared in machine/autoconf.h.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.116 src/sys/arch/sparc64/dev/psycho.c:1.117
--- src/sys/arch/sparc64/dev/psycho.c:1.116 Tue Sep 24 18:23:07 2013
+++ src/sys/arch/sparc64/dev/psycho.c Fri Nov 8 15:44:26 2013
@@ -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 @@ psycho_attach(device_t parent, device_t
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");
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.104 src/sys/arch/sparc64/sparc64/cpu.c:1.105
--- src/sys/arch/sparc64/sparc64/cpu.c:1.104 Tue Aug 20 19:19:23 2013
+++ src/sys/arch/sparc64/sparc64/cpu.c Fri Nov 8 15:44:26 2013
@@ -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 @@ static struct cpu_info *alloc_cpuinfo(u_
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;
