Module Name: src
Committed By: matt
Date: Sun Jul 29 00:04:05 UTC 2012
Modified Files:
src/sys/arch/sparc/dev: power.c power.h sbus.c vme_machdep.c
src/sys/arch/sparc/sparc: auxiotwo.c auxiotwo.h auxreg.c auxreg.h cpu.c
memecc.c memreg.c memreg.h timer.c timervar.h
Log Message:
Fix more -fno-common fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/dev/power.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/dev/power.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/dev/sbus.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/sparc/auxiotwo.c \
src/sys/arch/sparc/sparc/timervar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/sparc/auxiotwo.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sparc/sparc/auxreg.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/sparc/auxreg.h \
src/sys/arch/sparc/sparc/memecc.c
cvs rdiff -u -r1.235 -r1.236 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sparc/sparc/memreg.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/sparc/memreg.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/sparc/timer.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/sparc/dev/power.c
diff -u src/sys/arch/sparc/dev/power.c:1.18 src/sys/arch/sparc/dev/power.c:1.19
--- src/sys/arch/sparc/dev/power.c:1.18 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/dev/power.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: power.c,v 1.18 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: power.c,v 1.19 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1996
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: power.c,v 1.18 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: power.c,v 1.19 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -51,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: power.c,v 1.
#include <sparc/dev/power.h>
+volatile uint8_t *power_reg;
+
static int powermatch(device_t, cfdata_t, void *);
static void powerattach(device_t, device_t, void *);
Index: src/sys/arch/sparc/dev/power.h
diff -u src/sys/arch/sparc/dev/power.h:1.5 src/sys/arch/sparc/dev/power.h:1.6
--- src/sys/arch/sparc/dev/power.h:1.5 Wed Nov 16 00:49:03 2005
+++ src/sys/arch/sparc/dev/power.h Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: power.h,v 1.5 2005/11/16 00:49:03 uwe Exp $ */
+/* $NetBSD: power.h,v 1.6 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1996
@@ -51,7 +51,7 @@
#define POWER_BITS "\20\1POWEROFF"
#ifndef _LOCORE
-volatile uint8_t *power_reg;
+extern volatile uint8_t *power_reg;
#endif
extern void powerdown(void); /* power off function */
Index: src/sys/arch/sparc/dev/sbus.c
diff -u src/sys/arch/sparc/dev/sbus.c:1.76 src/sys/arch/sparc/dev/sbus.c:1.77
--- src/sys/arch/sparc/dev/sbus.c:1.76 Mon Jan 30 04:25:14 2012
+++ src/sys/arch/sparc/dev/sbus.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.76 2012/01/30 04:25:14 mrg Exp $ */
+/* $NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.76 2012/01/30 04:25:14 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.77 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -114,7 +114,7 @@ void sbus_attach_iommu(device_t, device_
void sbus_attach_xbox(device_t, device_t, void *);
static int sbus_error(void);
-int (*sbuserr_handler)(void);
+extern int (*sbuserr_handler)(void);
CFATTACH_DECL_NEW(sbus_mainbus, sizeof(struct sbus_softc),
sbus_match_mainbus, sbus_attach_mainbus, NULL, NULL);
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.66 src/sys/arch/sparc/dev/vme_machdep.c:1.67
--- src/sys/arch/sparc/dev/vme_machdep.c:1.66 Fri Jan 27 18:53:01 2012
+++ src/sys/arch/sparc/dev/vme_machdep.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.66 2012/01/27 18:53:01 para Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.67 2012/07/29 00:04:05 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.66 2012/01/27 18:53:01 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.67 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -168,7 +168,7 @@ CFATTACH_DECL_NEW(vme_iommu, sizeof(stru
static int vme_attached;
-int (*vmeerr_handler)(void);
+extern int (*vmeerr_handler)(void);
#define VMEMOD_D32 0x40 /* ??? */
Index: src/sys/arch/sparc/sparc/auxiotwo.c
diff -u src/sys/arch/sparc/sparc/auxiotwo.c:1.10 src/sys/arch/sparc/sparc/auxiotwo.c:1.11
--- src/sys/arch/sparc/sparc/auxiotwo.c:1.10 Sun Jul 17 23:32:37 2011
+++ src/sys/arch/sparc/sparc/auxiotwo.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: auxiotwo.c,v 1.10 2011/07/17 23:32:37 mrg Exp $ */
+/* $NetBSD: auxiotwo.c,v 1.11 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auxiotwo.c,v 1.10 2011/07/17 23:32:37 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxiotwo.c,v 1.11 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: auxiotwo.c,v
#include <sparc/sparc/auxiotwo.h>
#include <sparc/sparc/vaddrs.h>
+volatile u_char *auxiotwo_reg;
+u_char auxiotwo_regval;
+
static int serial_refcount;
static int serial_power;
Index: src/sys/arch/sparc/sparc/timervar.h
diff -u src/sys/arch/sparc/sparc/timervar.h:1.10 src/sys/arch/sparc/sparc/timervar.h:1.11
--- src/sys/arch/sparc/sparc/timervar.h:1.10 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/timervar.h Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: timervar.h,v 1.10 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: timervar.h,v 1.11 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -66,7 +66,7 @@ extern void tickle_tc(void);
/* Common timer attach routine in timer.c: */
void timerattach(volatile int *, volatile int *);
-void *sched_cookie; /* for schedclock() interrupts */
+extern void *sched_cookie; /* for schedclock() interrupts */
static inline u_long __attribute__((__unused__))
new_interval(void)
Index: src/sys/arch/sparc/sparc/auxiotwo.h
diff -u src/sys/arch/sparc/sparc/auxiotwo.h:1.4 src/sys/arch/sparc/sparc/auxiotwo.h:1.5
--- src/sys/arch/sparc/sparc/auxiotwo.h:1.4 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/sparc/auxiotwo.h Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: auxiotwo.h,v 1.4 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: auxiotwo.h,v 1.5 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -55,8 +55,8 @@
#define ZS_DISABLE 1
#ifndef _LOCORE
-volatile u_char *auxiotwo_reg;
-u_char auxiotwo_regval;
+extern volatile u_char *auxiotwo_reg;
+extern u_char auxiotwo_regval;
unsigned int auxiotwobisc(int, int);
void auxiotwoserialendis(int);
void auxiotwoserialsetapm(int);
Index: src/sys/arch/sparc/sparc/auxreg.c
diff -u src/sys/arch/sparc/sparc/auxreg.c:1.39 src/sys/arch/sparc/sparc/auxreg.c:1.40
--- src/sys/arch/sparc/sparc/auxreg.c:1.39 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/auxreg.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: auxreg.c,v 1.39 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: auxreg.c,v 1.40 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auxreg.c,v 1.39 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxreg.c,v 1.40 2012/07/29 00:04:05 matt Exp $");
#include "opt_blink.h"
@@ -56,6 +56,9 @@ __KERNEL_RCSID(0, "$NetBSD: auxreg.c,v 1
#include <sparc/sparc/vaddrs.h>
#include <sparc/sparc/auxreg.h>
+volatile u_char *auxio_reg;
+u_char auxio_regval;
+
static int auxregmatch_mainbus(device_t, cfdata_t, void *);
static int auxregmatch_obio(device_t, cfdata_t, void *);
static void auxregattach_mainbus(device_t, device_t, void *);
Index: src/sys/arch/sparc/sparc/auxreg.h
diff -u src/sys/arch/sparc/sparc/auxreg.h:1.13 src/sys/arch/sparc/sparc/auxreg.h:1.14
--- src/sys/arch/sparc/sparc/auxreg.h:1.13 Wed Jan 13 12:43:06 2010
+++ src/sys/arch/sparc/sparc/auxreg.h Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: auxreg.h,v 1.13 2010/01/13 12:43:06 tsutsui Exp $ */
+/* $NetBSD: auxreg.h,v 1.14 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -124,7 +124,7 @@
)
#ifndef _LOCORE
-volatile u_char *auxio_reg; /* Copy of AUXIO_REG */
-u_char auxio_regval;
+extern volatile u_char *auxio_reg; /* Copy of AUXIO_REG */
+extern u_char auxio_regval;
unsigned int auxregbisc(int, int);
#endif
Index: src/sys/arch/sparc/sparc/memecc.c
diff -u src/sys/arch/sparc/sparc/memecc.c:1.13 src/sys/arch/sparc/sparc/memecc.c:1.14
--- src/sys/arch/sparc/sparc/memecc.c:1.13 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/memecc.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: memecc.c,v 1.13 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: memecc.c,v 1.14 2012/07/29 00:04:05 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.13 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1.14 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@ static void memecc_attach(device_t, devi
static int memecc_match(device_t, cfdata_t, void *);
static int memecc_error(void);
-int (*memerr_handler)(void);
+extern int (*memerr_handler)(void);
CFATTACH_DECL_NEW(eccmemctl, sizeof(struct memecc_softc),
memecc_match, memecc_attach, NULL, NULL);
Index: src/sys/arch/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.235 src/sys/arch/sparc/sparc/cpu.c:1.236
--- src/sys/arch/sparc/sparc/cpu.c:1.235 Sun Mar 11 00:32:21 2012
+++ src/sys/arch/sparc/sparc/cpu.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.235 2012/03/11 00:32:21 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.235 2012/03/11 00:32:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -1058,7 +1058,7 @@ int hypersparc_getmid(void);
#define cypress_getmid hypersparc_getmid
int viking_getmid(void);
-int (*moduleerr_handler)(void);
+extern int (*moduleerr_handler)(void);
int viking_module_error(void);
struct module_info module_unknown = {
Index: src/sys/arch/sparc/sparc/memreg.c
diff -u src/sys/arch/sparc/sparc/memreg.c:1.44 src/sys/arch/sparc/sparc/memreg.c:1.45
--- src/sys/arch/sparc/sparc/memreg.c:1.44 Sun Jul 17 23:32:37 2011
+++ src/sys/arch/sparc/sparc/memreg.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: memreg.c,v 1.44 2011/07/17 23:32:37 mrg Exp $ */
+/* $NetBSD: memreg.c,v 1.45 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memreg.c,v 1.44 2011/07/17 23:32:37 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memreg.c,v 1.45 2012/07/29 00:04:05 matt Exp $");
#include "opt_sparc_arch.h"
@@ -68,6 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: memreg.c,v 1
#include <machine/reg.h> /* for trapframe */
#include <machine/trap.h> /* for trap types */
+volatile u_int *par_err_reg;
+
static int memregmatch_mainbus(device_t, cfdata_t, void *);
static int memregmatch_obio(device_t, cfdata_t, void *);
static void memregattach_mainbus(device_t, device_t, void *);
Index: src/sys/arch/sparc/sparc/memreg.h
diff -u src/sys/arch/sparc/sparc/memreg.h:1.9 src/sys/arch/sparc/sparc/memreg.h:1.10
--- src/sys/arch/sparc/sparc/memreg.h:1.9 Mon Nov 14 03:30:49 2005
+++ src/sys/arch/sparc/sparc/memreg.h Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: memreg.h,v 1.9 2005/11/14 03:30:49 uwe Exp $ */
+/* $NetBSD: memreg.h,v 1.10 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
* Sun-4c memory error register.
* The register is a single word.
*/
-volatile u_int *par_err_reg; /* virtual address; NULL if not yet mapped */
+extern volatile u_int *par_err_reg; /* virtual address; NULL if not yet mapped */
/*
* Bits in parity error register.
Index: src/sys/arch/sparc/sparc/timer.c
diff -u src/sys/arch/sparc/sparc/timer.c:1.29 src/sys/arch/sparc/sparc/timer.c:1.30
--- src/sys/arch/sparc/sparc/timer.c:1.29 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/timer.c Sun Jul 29 00:04:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.29 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: timer.c,v 1.30 2012/07/29 00:04:05 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.29 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.30 2012/07/29 00:04:05 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -79,6 +79,8 @@ static struct intrhand level14;
static u_int timer_get_timecount(struct timecounter *);
+void *sched_cookie;
+
/*
* timecounter local state
*/
