Fix some -fno-common fallout
This commit is contained in:
parent
5415192cf6
commit
234c45d0cb
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.36 2011/06/20 17:44:33 matt Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.37 2012/07/27 22:13:58 matt Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
@ -30,7 +30,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2011/06/20 17:44:33 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2012/07/27 22:13:58 matt Exp $");
|
||||
|
||||
#include "opt_explora.h"
|
||||
#include "opt_modular.h"
|
||||
|
@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.36 2011/06/20 17:44:33 matt Exp $");
|
|||
#define MEMREGIONS 2
|
||||
#define TLB_PG_SIZE (16*1024*1024)
|
||||
|
||||
char cpu_model[80];
|
||||
char machine[] = MACHINE; /* from <machine/param.h> */
|
||||
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
|
||||
|
||||
|
@ -82,8 +81,6 @@ static const unsigned int cpuspeed = 66000000;
|
|||
|
||||
prop_dictionary_t board_properties;
|
||||
struct vm_map *phys_map = NULL;
|
||||
char msgbuf[MSGBUFSIZE];
|
||||
paddr_t msgbuf_paddr;
|
||||
|
||||
static struct mem_region phys_mem[MEMREGIONS];
|
||||
static struct mem_region avail_mem[MEMREGIONS];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.20 2011/06/20 17:44:33 matt Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Jachym Holecek
|
||||
|
@ -34,7 +34,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/06/20 17:44:33 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2012/07/27 22:13:58 matt Exp $");
|
||||
|
||||
#include "opt_compat_netbsd.h"
|
||||
#include "opt_ddb.h"
|
||||
|
@ -97,12 +97,10 @@ struct vm_map *phys_map = NULL;
|
|||
/*
|
||||
* This should probably be in autoconf! XXX
|
||||
*/
|
||||
char cpu_model[80];
|
||||
char machine[] = MACHINE; /* from <machine/param.h> */
|
||||
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
|
||||
|
||||
char bootpath[256];
|
||||
paddr_t msgbuf_paddr;
|
||||
vaddr_t msgbuf_vaddr;
|
||||
|
||||
void initppc(vaddr_t, vaddr_t);
|
||||
|
@ -178,8 +176,6 @@ initppc(vaddr_t startkernel, vaddr_t endkernel)
|
|||
* Machine dependent startup code.
|
||||
*/
|
||||
|
||||
char msgbuf[MSGBUFSIZE];
|
||||
|
||||
void
|
||||
cpu_startup(void)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.54 2011/06/22 18:06:32 matt Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2001, 2002 Wasabi Systems, Inc.
|
||||
|
@ -67,7 +67,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2011/06/22 18:06:32 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2012/07/27 22:13:58 matt Exp $");
|
||||
|
||||
#include "opt_compat_netbsd.h"
|
||||
#include "opt_ddb.h"
|
||||
|
@ -134,13 +134,10 @@ struct vm_map *phys_map = NULL;
|
|||
/*
|
||||
* This should probably be in autoconf! XXX
|
||||
*/
|
||||
char cpu_model[80];
|
||||
char machine[] = MACHINE; /* from <machine/param.h> */
|
||||
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
|
||||
|
||||
char bootpath[256];
|
||||
paddr_t msgbuf_paddr;
|
||||
vaddr_t msgbuf_vaddr;
|
||||
|
||||
void initppc(vaddr_t, vaddr_t, char *, void *);
|
||||
|
||||
|
@ -226,8 +223,6 @@ initppc(vaddr_t startkernel, vaddr_t endkernel, char *args, void *info_block)
|
|||
* Machine dependent startup code.
|
||||
*/
|
||||
|
||||
char msgbuf[MSGBUFSIZE];
|
||||
|
||||
void
|
||||
cpu_startup(void)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cpu.h,v 1.20 2011/06/20 17:44:33 matt Exp $ */
|
||||
/* $NetBSD: cpu.h,v 1.21 2012/07/27 22:13:58 matt Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
|
@ -137,6 +137,10 @@ extern struct pic_ops pic_uic403;
|
|||
extern struct pic_ops pic_uic0;
|
||||
extern struct pic_ops pic_uic1;
|
||||
extern struct pic_ops pic_uic2;
|
||||
|
||||
extern paddr_t msgbuf_paddr;
|
||||
extern vaddr_t msgbuf_vaddr;
|
||||
extern char msgbuf[MSGBUFSIZE];
|
||||
#endif /* _KERNEL */
|
||||
|
||||
/* Board info dictionary */
|
||||
|
|
Loading…
Reference in New Issue