Module Name: src
Committed By: matt
Date: Fri Jul 27 22:24:13 UTC 2012
Modified Files:
src/sys/arch/powerpc/include/booke: cpuvar.h e500var.h
Log Message:
Fix -fno-common fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/booke/e500var.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/powerpc/include/booke/cpuvar.h
diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.12 src/sys/arch/powerpc/include/booke/cpuvar.h:1.13
--- src/sys/arch/powerpc/include/booke/cpuvar.h:1.12 Thu Jun 30 00:52:59 2011
+++ src/sys/arch/powerpc/include/booke/cpuvar.h Fri Jul 27 22:24:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.12 2011/06/30 00:52:59 matt Exp $ */
+/* $NetBSD: cpuvar.h,v 1.13 2012/07/27 22:24:13 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -157,7 +157,7 @@ struct trapframe;
void booke_sstep(struct trapframe *);
void booke_cpu_startup(const char *); /* model name */
-struct powerpc_bus_dma_tag booke_bus_dma_tag;
+extern struct powerpc_bus_dma_tag booke_bus_dma_tag;
extern struct cpu_info cpu_info[];
#ifdef MULTIPROCESSOR
Index: src/sys/arch/powerpc/include/booke/e500var.h
diff -u src/sys/arch/powerpc/include/booke/e500var.h:1.5 src/sys/arch/powerpc/include/booke/e500var.h:1.6
--- src/sys/arch/powerpc/include/booke/e500var.h:1.5 Thu Mar 29 15:45:06 2012
+++ src/sys/arch/powerpc/include/booke/e500var.h Fri Jul 27 22:24:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: e500var.h,v 1.5 2012/03/29 15:45:06 matt Exp $ */
+/* $NetBSD: e500var.h,v 1.6 2012/07/27 22:24:13 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -49,8 +49,8 @@
#define E500_CLOCK_TIMER 0 /* could be 0..3 */
extern const struct intrsw e500_intrsw;
-struct extent *pcimem_ex;
-struct extent *pciio_ex;
+extern struct extent *pcimem_ex;
+extern struct extent *pciio_ex;
void e500_device_register(device_t, void *);
int e500_clock_intr(void *);
void e500_cpu_start(void);