Module Name: src
Committed By: matt
Date: Sat Jul 28 23:11:01 UTC 2012
Modified Files:
src/sys/arch/ibmnws/ibmnws: machdep.c
src/sys/arch/ofppc/ofppc: machdep.c
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/oea: pmap.c pmap_kernel.c
src/sys/arch/powerpc/pic: pic_prepivr.c
src/sys/arch/sandpoint/sandpoint: autoconf.c
Log Message:
Fix -fno-common fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ibmnws/ibmnws/machdep.c
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/ofppc/ofppc/machdep.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/oea/pmap_kernel.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pic/pic_prepivr.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sandpoint/sandpoint/autoconf.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/ibmnws/ibmnws/machdep.c
diff -u src/sys/arch/ibmnws/ibmnws/machdep.c:1.16 src/sys/arch/ibmnws/ibmnws/machdep.c:1.17
--- src/sys/arch/ibmnws/ibmnws/machdep.c:1.16 Thu Jun 30 00:52:56 2011
+++ src/sys/arch/ibmnws/ibmnws/machdep.c Sat Jul 28 23:11:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.16 2011/06/30 00:52:56 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.17 2012/07/28 23:11:00 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2011/06/30 00:52:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2012/07/28 23:11:00 matt Exp $");
#include "opt_compat_netbsd.h"
@@ -76,6 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
void initppc(u_long, u_long, u_int, void *);
void dumpsys(void);
vaddr_t prep_intr_reg; /* PReP interrupt vector register */
+uint32_t prep_intr_reg_off;
#define OFMEMREGIONS 32
struct mem_region physmemr[OFMEMREGIONS], availmemr[OFMEMREGIONS];
Index: src/sys/arch/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.115 src/sys/arch/ofppc/ofppc/machdep.c:1.116
--- src/sys/arch/ofppc/ofppc/machdep.c:1.115 Fri Jul 1 20:51:14 2011
+++ src/sys/arch/ofppc/ofppc/machdep.c Sat Jul 28 23:11:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $ */
+/* $NetBSD: machdep.c,v 1.116 2012/07/28 23:11:01 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2011/07/01 20:51:14 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.116 2012/07/28 23:11:01 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,8 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#endif
#include "rtas.h"
-struct pmap ofw_pmap;
-char bootpath[256];
+extern struct pmap ofw_pmap;
+extern char bootpath[256];
extern u_int l2cr_config;
#if (NRTAS > 0)
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.92 src/sys/arch/powerpc/include/cpu.h:1.93
--- src/sys/arch/powerpc/include/cpu.h:1.92 Mon Jul 9 17:45:22 2012
+++ src/sys/arch/powerpc/include/cpu.h Sat Jul 28 23:11:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.92 2012/07/09 17:45:22 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.93 2012/07/28 23:11:00 matt Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -335,6 +335,7 @@ extern const char __CPU_MAXNUM;
#endif /* _MODULE */
#if !defined(_MODULE)
+extern char *booted_kernel;
extern int powersave;
extern int cpu_timebase;
extern int cpu_printfataltraps;
Index: src/sys/arch/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.26 src/sys/arch/powerpc/include/oea/pmap.h:1.27
--- src/sys/arch/powerpc/include/oea/pmap.h:1.26 Tue Sep 27 01:02:36 2011
+++ src/sys/arch/powerpc/include/oea/pmap.h Sat Jul 28 23:11:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.26 2011/09/27 01:02:36 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.27 2012/07/28 23:11:00 matt Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -138,6 +138,10 @@ pmap_remove_all(struct pmap *pmap)
#define PMAP_NEEDS_FIXUP
#endif
+extern volatile struct pteg *pmap_pteg_table;
+extern unsigned int pmap_pteg_cnt;
+extern unsigned int pmap_pteg_mask;
+
void pmap_bootstrap(vaddr_t, vaddr_t);
bool pmap_extract(pmap_t, vaddr_t, paddr_t *);
bool pmap_query_bit(struct vm_page *, int);
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.85 src/sys/arch/powerpc/oea/pmap.c:1.86
--- src/sys/arch/powerpc/oea/pmap.c:1.85 Fri Feb 3 19:29:59 2012
+++ src/sys/arch/powerpc/oea/pmap.c Sat Jul 28 23:11:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.85 2012/02/03 19:29:59 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.86 2012/07/28 23:11:00 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.85 2012/02/03 19:29:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.86 2012/07/28 23:11:00 matt Exp $");
#define PMAP_NOOPNAMES
@@ -91,24 +91,21 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.8
#include <powerpc/oea/sr_601.h>
#ifdef ALTIVEC
-int pmap_use_altivec;
+extern int pmap_use_altivec;
#endif
-volatile struct pteg *pmap_pteg_table;
-unsigned int pmap_pteg_cnt;
-unsigned int pmap_pteg_mask;
#ifdef PMAP_MEMLIMIT
static paddr_t pmap_memlimit = PMAP_MEMLIMIT;
#else
static paddr_t pmap_memlimit = -PAGE_SIZE; /* there is no limit */
#endif
-struct pmap kernel_pmap_;
-unsigned int pmap_pages_stolen;
-u_long pmap_pte_valid;
+extern struct pmap kernel_pmap_;
+static unsigned int pmap_pages_stolen;
+static u_long pmap_pte_valid;
#if defined(DIAGNOSTIC) || defined(DEBUG) || defined(PMAPCHECK)
-u_long pmap_pvo_enter_depth;
-u_long pmap_pvo_remove_depth;
+static u_long pmap_pvo_enter_depth;
+static u_long pmap_pvo_remove_depth;
#endif
#ifndef MSGBUFADDR
@@ -171,6 +168,10 @@ static u_int mem_cnt, avail_cnt;
#define pmap_pinit PMAPNAME(pinit)
#define pmap_procwr PMAPNAME(procwr)
+#define pmap_pool PMAPNAME(pool)
+#define pmap_upvo_pool PMAPNAME(upvo_pool)
+#define pmap_mpvo_pool PMAPNAME(mpvo_pool)
+#define pmap_pvo_table PMAPNAME(pvo_table)
#if defined(DEBUG) || defined(PMAPCHECK) || defined(DDB)
#define pmap_pte_print PMAPNAME(pte_print)
#define pmap_pteg_check PMAPNAME(pteg_check)
@@ -336,10 +337,10 @@ struct pvo_page {
SIMPLEQ_HEAD(pvop_head, pvo_page);
static struct pvop_head pmap_upvop_head = SIMPLEQ_HEAD_INITIALIZER(pmap_upvop_head);
static struct pvop_head pmap_mpvop_head = SIMPLEQ_HEAD_INITIALIZER(pmap_mpvop_head);
-u_long pmap_upvop_free;
-u_long pmap_upvop_maxfree;
-u_long pmap_mpvop_free;
-u_long pmap_mpvop_maxfree;
+static u_long pmap_upvop_free;
+static u_long pmap_upvop_maxfree;
+static u_long pmap_mpvop_free;
+static u_long pmap_mpvop_maxfree;
static void *pmap_pool_ualloc(struct pool *, int);
static void *pmap_pool_malloc(struct pool *, int);
Index: src/sys/arch/powerpc/oea/pmap_kernel.c
diff -u src/sys/arch/powerpc/oea/pmap_kernel.c:1.9 src/sys/arch/powerpc/oea/pmap_kernel.c:1.10
--- src/sys/arch/powerpc/oea/pmap_kernel.c:1.9 Thu Jun 30 00:52:59 2011
+++ src/sys/arch/powerpc/oea/pmap_kernel.c Sat Jul 28 23:11:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_kernel.c,v 1.9 2011/06/30 00:52:59 matt Exp $ */
+/* $NetBSD: pmap_kernel.c,v 1.10 2012/07/28 23:11:01 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,15 +30,23 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.9 2011/06/30 00:52:59 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.10 2012/07/28 23:11:01 matt Exp $");
+#include "opt_altivec.h"
#include "opt_ddb.h"
#include "opt_pmap.h"
#include <sys/param.h>
#include <uvm/uvm_extern.h>
-extern struct pmap kernel_pmap_;
+#ifdef ALTIVEC
+int pmap_use_altivec;
+#endif
+volatile struct pteg *pmap_pteg_table;
+unsigned int pmap_pteg_cnt;
+unsigned int pmap_pteg_mask;
+
+struct pmap kernel_pmap_;
struct pmap *const kernel_pmap_ptr = &kernel_pmap_;
u_int
Index: src/sys/arch/powerpc/pic/pic_prepivr.c
diff -u src/sys/arch/powerpc/pic/pic_prepivr.c:1.7 src/sys/arch/powerpc/pic/pic_prepivr.c:1.8
--- src/sys/arch/powerpc/pic/pic_prepivr.c:1.7 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/pic/pic_prepivr.c Sat Jul 28 23:11:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_prepivr.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: pic_prepivr.c,v 1.8 2012/07/28 23:11:01 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.8 2012/07/28 23:11:01 matt Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -50,8 +50,8 @@ static int prepivr_get_irq(struct pic_o
static int motivr_get_irq(struct pic_ops *, int);
static void prepivr_establish_irq(struct pic_ops *, int, int, int);
-vaddr_t prep_intr_reg; /* PReP interrupt vector register */
-uint32_t prep_intr_reg_off; /* IVR offset within the mapped page */
+extern vaddr_t prep_intr_reg; /* PReP interrupt vector register */
+extern uint32_t prep_intr_reg_off; /* IVR offset within the mapped page */
#define IO_ELCR1 0x4d0
#define IO_ELCR2 0x4d1
Index: src/sys/arch/sandpoint/sandpoint/autoconf.c
diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.25 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.26
--- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.25 Sat May 12 13:13:24 2012
+++ src/sys/arch/sandpoint/sandpoint/autoconf.c Sat Jul 28 23:11:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.25 2012/05/12 13:13:24 nisimura Exp $ */
+/* $NetBSD: autoconf.c,v 1.26 2012/07/28 23:11:01 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2012/05/12 13:13:24 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.26 2012/07/28 23:11:01 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,8 +92,6 @@ cpu_configure(void)
genppc_cpu_configure();
}
-char *booted_kernel; /* should be a genuine filename */
-
void
cpu_rootconf(void)
{
