Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Fix more -fno-common fallout.
details: https://anonhg.NetBSD.org/src/rev/7612130b521c
branches: trunk
changeset: 780553:7612130b521c
user: matt <matt%NetBSD.org@localhost>
date: Sun Jul 29 00:07:06 2012 +0000
description:
Fix more -fno-common fallout.
Move more variables to common locations.
diffstat:
sys/arch/acorn26/podulebus/unixbpvar.h | 4 ++--
sys/arch/acorn32/acorn32/rpc_machdep.c | 16 +++-------------
sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c | 15 ++-------------
sys/arch/acorn32/podulebus/sbicvar.h | 4 ++--
sys/arch/arm/arm32/arm32_machdep.c | 8 ++++++--
sys/arch/arm/include/arm32/machdep.h | 8 +++++++-
sys/arch/arm/include/arm32/pmap.h | 7 ++++++-
sys/arch/arm/marvell/mvsoc_intr.c | 5 +++--
sys/arch/arm/marvell/mvsoc_intr.h | 4 ++--
sys/arch/arm/xscale/i80200var.h | 4 ++--
sys/arch/arm/xscale/pxa2x0_intr.c | 5 +++--
sys/arch/arm/xscale/pxa2x0_intr.h | 4 ++--
sys/arch/cats/cats/cats_machdep.c | 15 ++-------------
sys/arch/evbarm/adi_brh/brh_machdep.c | 12 ++----------
sys/arch/evbarm/armadillo/armadillo9_machdep.c | 15 ++-------------
sys/arch/evbarm/beagle/beagle_machdep.c | 14 ++------------
sys/arch/evbarm/conf/OVERO | 4 ++--
sys/arch/evbarm/evbarm/initarm_common.c | 10 ++--------
sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c | 10 +---------
sys/arch/evbarm/gemini/gemini_machdep.c | 14 ++------------
sys/arch/evbarm/gumstix/gumstix_machdep.c | 13 +------------
sys/arch/evbarm/hdl_g/hdlg_machdep.c | 15 ++-------------
sys/arch/evbarm/imx31/imx31lk_machdep.c | 14 ++------------
sys/arch/evbarm/integrator/integrator_machdep.c | 14 ++------------
sys/arch/evbarm/iq80310/iq80310_machdep.c | 13 ++-----------
sys/arch/evbarm/iq80321/iq80321_machdep.c | 12 ++----------
sys/arch/evbarm/ixdp425/ixdp425_machdep.c | 11 ++---------
sys/arch/evbarm/ixm1200/ixm1200_machdep.c | 13 ++-----------
sys/arch/evbarm/lubbock/lubbock_machdep.c | 13 ++-----------
sys/arch/evbarm/marvell/marvell_machdep.c | 15 ++-------------
sys/arch/evbarm/mini2440/mini2440_machdep.c | 12 +-----------
sys/arch/evbarm/netwalker/netwalker_machdep.c | 14 ++------------
sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c | 12 ++----------
sys/arch/evbarm/nslu2/nslu2_machdep.c | 11 ++---------
sys/arch/evbarm/osk5912/osk5912_machdep.c | 13 ++-----------
sys/arch/evbarm/rpi/rpi_machdep.c | 16 ++--------------
sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c | 14 ++------------
sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c | 14 ++------------
sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c | 14 ++------------
sys/arch/evbarm/tsarm/tsarm_machdep.c | 14 ++------------
sys/arch/evbarm/viper/viper_machdep.c | 12 ++----------
sys/arch/hpcarm/hpcarm/hpc_machdep.c | 13 ++++---------
sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c | 13 ++-----------
sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c | 14 +++-----------
sys/arch/iyonix/iyonix/autoconf.c | 7 ++-----
sys/arch/iyonix/iyonix/iyonix_machdep.c | 12 ++----------
sys/arch/shark/ofw/ofw.c | 10 ++--------
sys/arch/shark/shark/shark_machdep.c | 8 ++------
sys/arch/zaurus/zaurus/machdep.c | 12 ++----------
49 files changed, 114 insertions(+), 432 deletions(-)
diffs (truncated from 1627 to 300 lines):
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/acorn26/podulebus/unixbpvar.h
--- a/sys/arch/acorn26/podulebus/unixbpvar.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/acorn26/podulebus/unixbpvar.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: unixbpvar.h,v 1.3 2009/01/04 00:36:00 bjh21 Exp $ */
+/* $NetBSD: unixbpvar.h,v 1.4 2012/07/29 00:07:11 matt Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -36,6 +36,6 @@
extern int unixbp_irq_status_full(void);
extern void unixbp_irq_setmask(int);
-device_t the_unixbp;
+extern device_t the_unixbp;
#endif
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.83 2012/05/10 10:27:09 skrll Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.84 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.83 2012/05/10 10:27:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.84 2012/07/29 00:07:10 matt Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -84,6 +84,7 @@
#include <arm/cpuconf.h>
#include <arm/arm32/katelib.h>
#include <arm/arm32/machdep.h>
+#include <arm/arm32/pmap.h>
#include <arm/undefined.h>
#include <machine/rtc.h>
@@ -154,19 +155,8 @@
u_int videodram_size = 0; /* Amount of DRAM to reserve for video */
-/* Physical and virtual addresses for some global pages */
-pv_addr_t systempage;
-pv_addr_t irqstack;
-pv_addr_t undstack;
-pv_addr_t abtstack;
-pv_addr_t kernelstack;
-
paddr_t msgbufphys;
-extern u_int data_abort_handler_address;
-extern u_int prefetch_abort_handler_address;
-extern u_int undefined_handler_address;
-
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
#endif /* PMAP_DEBUG */
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.22 2012/05/10 10:27:09 skrll Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.23 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.22 2012/05/10 10:27:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.23 2012/07/29 00:07:10 matt Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -156,19 +156,8 @@
u_int videodram_size = 0; /* Amount of DRAM to reserve for video */
-/* Physical and virtual addresses for some global pages */
-pv_addr_t systempage;
-pv_addr_t irqstack;
-pv_addr_t undstack;
-pv_addr_t abtstack;
-pv_addr_t kernelstack;
-
paddr_t msgbufphys;
-extern u_int data_abort_handler_address;
-extern u_int prefetch_abort_handler_address;
-extern u_int undefined_handler_address;
-
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
#endif /* PMAP_DEBUG */
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/acorn32/podulebus/sbicvar.h
--- a/sys/arch/acorn32/podulebus/sbicvar.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/acorn32/podulebus/sbicvar.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbicvar.h,v 1.4 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: sbicvar.h,v 1.5 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -80,7 +80,7 @@
u_char flags;
u_char period; /* Period suggestion */
u_char offset; /* Offset suggestion */
-} tinfo_t;
+};
struct sbic_softc {
struct device sc_dev;
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.78 2012/07/16 06:33:05 skrll Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.79 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.78 2012/07/16 06:33:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.79 2012/07/29 00:07:10 matt Exp $");
#include "opt_modular.h"
#include "opt_md.h"
@@ -79,6 +79,10 @@
#endif /* MEMORY_DISK_HOOKS && !MEMORY_DISK_ROOT_SIZE */
pv_addr_t kernelstack;
+pv_addr_t abtstack;
+pv_addr_t fiqstack;
+pv_addr_t irqstack;
+pv_addr_t undstack;
void * msgbufaddr;
extern paddr_t msgbufphys;
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/include/arm32/machdep.h
--- a/sys/arch/arm/include/arm32/machdep.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/include/arm32/machdep.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,8 +1,14 @@
-/* $NetBSD: machdep.h,v 1.9 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: machdep.h,v 1.10 2012/07/29 00:07:10 matt Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
+extern u_int data_abort_handler_address;
+extern u_int prefetch_abort_handler_address;
+extern u_int undefined_handler_address;
+
+extern char *booted_kernel;
+
/* misc prototypes used by the many arm machdeps */
void halt(void);
void parse_mi_bootargs(char *);
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.101 2012/01/28 00:18:30 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.102 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -212,6 +212,11 @@
extern pv_addrqh_t pmap_freeq;
extern pv_addr_t kernelpages;
+extern pv_addr_t kernelstack;
+extern pv_addr_t abtstack;
+extern pv_addr_t fiqstack;
+extern pv_addr_t irqstack;
+extern pv_addr_t undstack;
extern pv_addr_t systempage;
extern pv_addr_t kernel_l1pt;
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/marvell/mvsoc_intr.c
--- a/sys/arch/arm/marvell/mvsoc_intr.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/marvell/mvsoc_intr.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_intr.c,v 1.4 2012/07/22 17:14:18 jakllsch Exp $ */
+/* $NetBSD: mvsoc_intr.c,v 1.5 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.4 2012/07/22 17:14:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.5 2012/07/29 00:07:10 matt Exp $");
#define _INTR_PRIVATE
@@ -40,6 +40,7 @@
#include <arm/marvell/mvsocreg.h>
#include <arm/marvell/mvsocvar.h>
+int (*find_pending_irqs)(void);
static void mvsoc_bridge_pic_unblock_irqs(struct pic_softc *, size_t, uint32_t);
static void mvsoc_bridge_pic_block_irqs(struct pic_softc *, size_t, uint32_t);
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/marvell/mvsoc_intr.h
--- a/sys/arch/arm/marvell/mvsoc_intr.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/marvell/mvsoc_intr.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_intr.h,v 1.1 2010/10/03 05:49:24 kiyohara Exp $ */
+/* $NetBSD: mvsoc_intr.h,v 1.2 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -31,7 +31,7 @@
#define ARM_IRQ_HANDLER _C_LABEL(mvsoc_irq_handler)
#ifndef _LOCORE
-int (*find_pending_irqs)(void);
+extern int (*find_pending_irqs)(void);
void mvsoc_irq_handler(void *);
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/xscale/i80200var.h
--- a/sys/arch/arm/xscale/i80200var.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/xscale/i80200var.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80200var.h,v 1.4 2002/08/16 04:55:48 briggs Exp $ */
+/* $NetBSD: i80200var.h,v 1.5 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -44,6 +44,6 @@
void i80200_intr_disable(uint32_t);
struct irqframe;
-void (*i80200_extirq_dispatch)(struct irqframe *);
+extern void (*i80200_extirq_dispatch)(struct irqframe *);
#endif /* _ARM_XSCALE_I80200VAR_H_ */
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/xscale/pxa2x0_intr.c
--- a/sys/arch/arm/xscale/pxa2x0_intr.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_intr.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_intr.c,v 1.19 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: pxa2x0_intr.c,v 1.20 2012/07/29 00:07:10 matt Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.19 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.20 2012/07/29 00:07:10 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,6 +90,7 @@
/* struct evbnt ev; */
} handler[ICU_LEN];
+vaddr_t pxaic_base;
volatile int softint_pending;
volatile int intr_mask;
/* interrupt masks for each level */
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/arm/xscale/pxa2x0_intr.h
--- a/sys/arch/arm/xscale/pxa2x0_intr.h Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_intr.h Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_intr.h,v 1.12 2008/11/19 06:35:56 matt Exp $ */
+/* $NetBSD: pxa2x0_intr.h,v 1.13 2012/07/29 00:07:10 matt Exp $ */
/* Derived from i80321_intr.h */
@@ -51,7 +51,7 @@
#include <arm/xscale/pxa2x0reg.h>
-vaddr_t pxaic_base; /* Shared with pxa2x0_irq.S */
+extern vaddr_t pxaic_base; /* Shared with pxa2x0_irq.S */
#define read_icu(offset) (*(volatile uint32_t *)(pxaic_base + (offset)))
#define write_icu(offset,value) \
(*(volatile uint32_t *)(pxaic_base + (offset)) = (value))
diff -r 0964f7e55e5e -r 7612130b521c sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Sun Jul 29 00:04:05 2012 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Sun Jul 29 00:07:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.72 2012/02/06 17:51:47 matt Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.73 2012/07/29 00:07:10 matt Exp $ */
Home |
Main Index |
Thread Index |
Old Index