Module Name: src
Committed By: matt
Date: Sat Jul 28 23:08:57 UTC 2012
Modified Files:
src/sys/arch/algor/include: intr.h
src/sys/arch/arc/arc: machdep.c
src/sys/arch/cobalt/cobalt: machdep.c
src/sys/arch/emips/emips: machdep.c
src/sys/arch/ews4800mips/ews4800mips: machdep.c
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/mipsco/mipsco: machdep.c
src/sys/arch/newsmips/dev: zs.c
src/sys/arch/newsmips/include: z8530var.h
src/sys/arch/newsmips/newsmips: cpu_cons.c machdep.c
src/sys/arch/pmax/pmax: machdep.c
Log Message:
Fix -fno-common fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/algor/include/intr.h
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/dev/zs.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/newsmips/include/z8530var.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/newsmips/newsmips/cpu_cons.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/pmax/pmax/machdep.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/algor/include/intr.h
diff -u src/sys/arch/algor/include/intr.h:1.15 src/sys/arch/algor/include/intr.h:1.16
--- src/sys/arch/algor/include/intr.h:1.15 Sat Jul 9 16:03:01 2011
+++ src/sys/arch/algor/include/intr.h Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.15 2011/07/09 16:03:01 matt Exp $ */
+/* $NetBSD: intr.h,v 1.16 2012/07/28 23:08:56 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -49,10 +49,10 @@ struct evbmips_intrhand {
};
extern struct evcnt mips_int5_evcnt;
+extern void *(*algor_intr_establish)(int, int (*)(void *), void *);
+extern void (*algor_intr_disestablish)(void *);
void intr_init(void);
-void *(*algor_intr_establish)(int, int (*)(void *), void *);
-void (*algor_intr_disestablish)(void *);
#endif /* _KERNEL */
#endif /* ! _ALGOR_INTR_H_ */
Index: src/sys/arch/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.125 src/sys/arch/arc/arc/machdep.c:1.126
--- src/sys/arch/arc/arc/machdep.c:1.125 Sat Jul 28 19:08:22 2012
+++ src/sys/arch/arc/arc/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.125 2012/07/28 19:08:22 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.126 2012/07/28 23:08:56 matt Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.125 2012/07/28 19:08:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.126 2012/07/28 23:08:56 matt Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -121,9 +121,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#endif
#endif /* NCOM */
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store;
-
/* maps for VM objects */
struct vm_map *phys_map = NULL;
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.113 src/sys/arch/cobalt/cobalt/machdep.c:1.114
--- src/sys/arch/cobalt/cobalt/machdep.c:1.113 Sat Jul 28 19:08:22 2012
+++ src/sys/arch/cobalt/cobalt/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.113 2012/07/28 19:08:22 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.114 2012/07/28 23:08:56 matt Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2012/07/28 19:08:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2012/07/28 23:08:56 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -93,9 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/exec_elf.h>
#endif
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store;
-
/* Maps for VM objects. */
struct vm_map *phys_map = NULL;
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.6 src/sys/arch/emips/emips/machdep.c:1.7
--- src/sys/arch/emips/emips/machdep.c:1.6 Fri Jan 27 18:52:53 2012
+++ src/sys/arch/emips/emips/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.6 2012/01/27 18:52:53 para Exp $ */
+/* $NetBSD: machdep.c,v 1.7 2012/07/28 23:08:56 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2012/01/27 18:52:53 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2012/07/28 23:08:56 matt Exp $");
#include "opt_ddb.h"
@@ -86,9 +86,6 @@ extern vsize_t iospace_size;
#include "ksyms.h"
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store;
-
/*
* Extent map to manage I/O register space. We allocate storage for
* 32 regions in the map. iomap_ex_malloc_safe will indicate that it's
@@ -105,7 +102,6 @@ struct vm_map *phys_map = NULL;
int systype; /* mother board type */
char *bootinfo = NULL; /* pointer to bootinfo structure */
int cpuspeed = 30; /* approx # instr per usec. */
-int physmem; /* max supported memory, changes to actual */
intptr_t physmem_boardmax; /* {model,SIMM}-specific bound on physmem */
int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.24 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.25
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.24 Sun Feb 20 07:55:20 2011
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.24 2011/02/20 07:55:20 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.25 2012/07/28 23:08:56 matt Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2011/02/20 07:55:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2012/07/28 23:08:56 matt Exp $");
#include "opt_ddb.h"
@@ -69,9 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
vsize_t kseg2iobufsize; /* to reserve PTEs for KSEG2 I/O space */
-/* our exported CPU info */
-struct cpu_info cpu_info_store;
-
/* maps for VM objects */
struct vm_map *phys_map;
@@ -98,14 +95,6 @@ mach_init(int argc, char *argv[], struct
* the firmware directly and have to clear BSS here.
*/
memset(edata, 0, end - edata);
- /*
- * XXX
- * lwp0 and cpu_info_store are allocated in BSS
- * and initialized before mach_init() is called,
- * so restore them again.
- */
- lwp0.l_cpu = &cpu_info_store;
- cpu_info_store.ci_curlwp = &lwp0;
}
/* Setup early-console with BIOS ROM routines */
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.115 src/sys/arch/hpcmips/hpcmips/machdep.c:1.116
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.115 Sat Jul 28 19:08:23 2012
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.115 2012/07/28 19:08:23 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.116 2012/07/28 23:08:56 matt Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2012/07/28 19:08:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.116 2012/07/28 23:08:56 matt Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -153,7 +153,6 @@ static int __bicons_enable;
/* the following is used externally (sysctl_hw) */
char hpcmips_cpuname[40]; /* set CPU depend xx_init() */
-struct cpu_info cpu_info_store; /* only one CPU */
int cpuspeed = 1; /* approx # instr per usec. */
/* CPU core switch table */
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.75 src/sys/arch/mipsco/mipsco/machdep.c:1.76
--- src/sys/arch/mipsco/mipsco/machdep.c:1.75 Sat Jul 28 19:08:24 2012
+++ src/sys/arch/mipsco/mipsco/machdep.c Sat Jul 28 23:08:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.75 2012/07/28 19:08:24 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.76 2012/07/28 23:08:56 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2012/07/28 19:08:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76 2012/07/28 23:08:56 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -99,9 +99,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "com.h" /* XXX */
#include "ksyms.h"
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store;
-
/* maps for VM objects */
struct vm_map *phys_map = NULL;
@@ -152,7 +149,6 @@ struct platform platform = {
.clkinit = NULL,
};
-struct consdev *cn_tab = NULL;
extern struct consdev consdev_prom;
extern struct consdev consdev_zs;
Index: src/sys/arch/newsmips/dev/zs.c
diff -u src/sys/arch/newsmips/dev/zs.c:1.26 src/sys/arch/newsmips/dev/zs.c:1.27
--- src/sys/arch/newsmips/dev/zs.c:1.26 Sat Jun 26 03:44:49 2010
+++ src/sys/arch/newsmips/dev/zs.c Sat Jul 28 23:08:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $ */
+/* $NetBSD: zs.c,v 1.27 2012/07/28 23:08:57 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.27 2012/07/28 23:08:57 matt Exp $");
#include "opt_ddb.h"
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.26
#include "ioconf.h"
+void (*zs_delay)(void);
+
#define ZS_DELAY() (*zs_delay)()
/*
Index: src/sys/arch/newsmips/include/z8530var.h
diff -u src/sys/arch/newsmips/include/z8530var.h:1.11 src/sys/arch/newsmips/include/z8530var.h:1.12
--- src/sys/arch/newsmips/include/z8530var.h:1.11 Sat Jun 26 03:49:52 2010
+++ src/sys/arch/newsmips/include/z8530var.h Sat Jul 28 23:08:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530var.h,v 1.11 2010/06/26 03:49:52 tsutsui Exp $ */
+/* $NetBSD: z8530var.h,v 1.12 2012/07/28 23:08:57 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -112,7 +112,7 @@ void zs_write_data(struct zs_chanstate
int zs_print(void *, const char *);
int zshard(void *);
int zs_get_speed(struct zs_chanstate *);
-void (*zs_delay)(void);
+extern void (*zs_delay)(void);
#define splzs() splserial()
#define IPL_ZS IPL_SERIAL
Index: src/sys/arch/newsmips/newsmips/cpu_cons.c
diff -u src/sys/arch/newsmips/newsmips/cpu_cons.c:1.12 src/sys/arch/newsmips/newsmips/cpu_cons.c:1.13
--- src/sys/arch/newsmips/newsmips/cpu_cons.c:1.12 Tue Feb 8 20:20:21 2011
+++ src/sys/arch/newsmips/newsmips/cpu_cons.c Sat Jul 28 23:08:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_cons.c,v 1.12 2011/02/08 20:20:21 rmind Exp $ */
+/* $NetBSD: cpu_cons.c,v 1.13 2012/07/28 23:08:57 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_cons.c,v 1.12 2011/02/08 20:20:21 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_cons.c,v 1.13 2012/07/28 23:08:57 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_cons.c,v
#define SW_FBPOP2 0x03
#define SW_AUTOSEL 0x07
-struct consdev *cn_tab = NULL;
extern struct consdev consdev_zs, consdev_zs_ap;
void fb_cnattach(void);
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.113 src/sys/arch/newsmips/newsmips/machdep.c:1.114
--- src/sys/arch/newsmips/newsmips/machdep.c:1.113 Wed Mar 9 13:21:36 2011
+++ src/sys/arch/newsmips/newsmips/machdep.c Sat Jul 28 23:08:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.113 2011/03/09 13:21:36 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.114 2012/07/28 23:08:57 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2011/03/09 13:21:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2012/07/28 23:08:57 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -103,9 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include "ksyms.h"
-/* Our exported CPU info; we can have only one. */
-struct cpu_info cpu_info_store;
-
/* maps for VM objects */
struct vm_map *phys_map = NULL;
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.244 src/sys/arch/pmax/pmax/machdep.c:1.245
--- src/sys/arch/pmax/pmax/machdep.c:1.244 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/machdep.c Sat Jul 28 23:08:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.244 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.245 2012/07/28 23:08:57 matt Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.244 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.245 2012/07/28 23:08:57 matt Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -95,7 +95,6 @@ struct vm_map *phys_map = NULL;
int systype; /* mother board type */
char *bootinfo = NULL; /* pointer to bootinfo structure */
int cpuspeed = 30; /* approx # instr per usec. */
-int physmem; /* max supported memory, changes to actual */
intptr_t physmem_boardmax; /* {model,SIMM}-specific bound on physmem */
int mem_cluster_cnt;
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
