Module Name: src
Committed By: matt
Date: Fri Jul 27 22:13:58 UTC 2012
Modified Files:
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
src/sys/arch/powerpc/include/ibm4xx: cpu.h
Log Message:
Fix some -fno-common fallout
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/ibm4xx/cpu.h
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/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.36 src/sys/arch/evbppc/explora/machdep.c:1.37
--- src/sys/arch/evbppc/explora/machdep.c:1.36 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/explora/machdep.c Fri Jul 27 22:13:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.36 2011/06/20 17:44:33 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.37 2012/07/27 22:13:58 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2011/06/20 17:44:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2012/07/27 22:13:58 matt Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define MEMREGIONS 2
#define TLB_PG_SIZE (16*1024*1024)
-char cpu_model[80];
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
@@ -82,8 +81,6 @@ static const unsigned int cpuspeed = 660
prop_dictionary_t board_properties;
struct vm_map *phys_map = NULL;
-char msgbuf[MSGBUFSIZE];
-paddr_t msgbuf_paddr;
static struct mem_region phys_mem[MEMREGIONS];
static struct mem_region avail_mem[MEMREGIONS];
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.20 src/sys/arch/evbppc/virtex/machdep.c:1.21
--- src/sys/arch/evbppc/virtex/machdep.c:1.20 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/virtex/machdep.c Fri Jul 27 22:13:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.20 2011/06/20 17:44:33 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/06/20 17:44:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -97,12 +97,10 @@ struct vm_map *phys_map = NULL;
/*
* This should probably be in autoconf! XXX
*/
-char cpu_model[80];
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
char bootpath[256];
-paddr_t msgbuf_paddr;
vaddr_t msgbuf_vaddr;
void initppc(vaddr_t, vaddr_t);
@@ -178,8 +176,6 @@ initppc(vaddr_t startkernel, vaddr_t end
* Machine dependent startup code.
*/
-char msgbuf[MSGBUFSIZE];
-
void
cpu_startup(void)
{
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.54 src/sys/arch/evbppc/walnut/machdep.c:1.55
--- src/sys/arch/evbppc/walnut/machdep.c:1.54 Wed Jun 22 18:06:32 2011
+++ src/sys/arch/evbppc/walnut/machdep.c Fri Jul 27 22:13:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2011/06/22 18:06:32 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2011/06/22 18:06:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -134,13 +134,10 @@ struct vm_map *phys_map = NULL;
/*
* This should probably be in autoconf! XXX
*/
-char cpu_model[80];
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
char bootpath[256];
-paddr_t msgbuf_paddr;
-vaddr_t msgbuf_vaddr;
void initppc(vaddr_t, vaddr_t, char *, void *);
@@ -226,8 +223,6 @@ initppc(vaddr_t startkernel, vaddr_t end
* Machine dependent startup code.
*/
-char msgbuf[MSGBUFSIZE];
-
void
cpu_startup(void)
{
Index: src/sys/arch/powerpc/include/ibm4xx/cpu.h
diff -u src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.20 src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.21
--- src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.20 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/powerpc/include/ibm4xx/cpu.h Fri Jul 27 22:13:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.20 2011/06/20 17:44:33 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.21 2012/07/27 22:13:58 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -137,6 +137,10 @@ extern struct pic_ops pic_uic403;
extern struct pic_ops pic_uic0;
extern struct pic_ops pic_uic1;
extern struct pic_ops pic_uic2;
+
+extern paddr_t msgbuf_paddr;
+extern vaddr_t msgbuf_vaddr;
+extern char msgbuf[MSGBUFSIZE];
#endif /* _KERNEL */
/* Board info dictionary */
