Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Fix -fno-common found by building i386/conf/ALL
details: https://anonhg.NetBSD.org/src/rev/0fe3953e22c9
branches: trunk
changeset: 780528:0fe3953e22c9
user: matt <matt%NetBSD.org@localhost>
date: Sat Jul 28 00:43:22 2012 +0000
description:
Fix -fno-common found by building i386/conf/ALL
diffstat:
sys/compat/ndis/ntoskrnl_var.h | 2 +-
sys/compat/ndis/subr_hal.c | 6 +++++-
sys/dev/dm/dm.h | 5 +++--
sys/dev/ic/ncr5380sbc.c | 5 +++--
sys/dev/ic/ncr5380var.h | 4 ++--
sys/dev/if_ndis/if_ndis.c | 6 ++++--
sys/dev/if_ndis/if_ndisvar.h | 4 ++--
sys/fs/hfs/libhfs.c | 13 +++++++++++--
sys/fs/hfs/libhfs.h | 6 +++---
sys/fs/nilfs/nilfs.h | 4 ++--
sys/kern/kgdb_stub.c | 9 +++++++--
sys/net/if_etherip.c | 6 ++++--
sys/net/if_etherip.h | 5 +++--
sys/net/npf/npf_impl.h | 4 ++--
sys/netiso/eonvar.h | 4 ++--
sys/netiso/if_eon.c | 5 +++--
16 files changed, 57 insertions(+), 31 deletions(-)
diffs (truncated from 360 to 300 lines):
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/compat/ndis/ntoskrnl_var.h
--- a/sys/compat/ndis/ntoskrnl_var.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/compat/ndis/ntoskrnl_var.h Sat Jul 28 00:43:22 2012 +0000
@@ -302,7 +302,7 @@
/* TODO: What is the best way to do this? */
-int win_irql;
+extern int win_irql;
#define AT_DISPATCH_LEVEL(useless) \
(win_irql == DISPATCH_LEVEL)
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/compat/ndis/subr_hal.c
--- a/sys/compat/ndis/subr_hal.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/compat/ndis/subr_hal.c Sat Jul 28 00:43:22 2012 +0000
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.13.2.3 2005/03/31 04:24:35 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_hal.c,v 1.7 2009/03/18 10:22:39 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_hal.c,v 1.8 2012/07/28 00:43:22 matt Exp $");
#endif
#include <sys/param.h>
@@ -95,6 +95,10 @@
extern struct mtx_pool *ndis_mtxpool;
+#ifdef __NetBSD__
+int win_irql;
+#endif
+
int
hal_libinit(void)
{
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/dev/dm/dm.h
--- a/sys/dev/dm/dm.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/dev/dm/dm.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.h,v 1.23 2011/08/27 17:07:49 ahoka Exp $ */
+/* $NetBSD: dm.h,v 1.24 2012/07/28 00:43:22 matt Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -120,7 +120,8 @@
* This structure is called for every device-mapper device.
* It points to SLIST of device tables and mirrored, snapshoted etc. devices.
*/
-TAILQ_HEAD(dm_dev_head, dm_dev) dm_devs;
+TAILQ_HEAD(dm_dev_head, dm_dev);
+//extern struct dm_dev_head dm_devs;
typedef struct dm_dev {
char name[DM_NAME_LEN];
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/dev/ic/ncr5380sbc.c
--- a/sys/dev/ic/ncr5380sbc.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/dev/ic/ncr5380sbc.c Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380sbc.c,v 1.65 2010/07/27 19:44:16 jakllsch Exp $ */
+/* $NetBSD: ncr5380sbc.c,v 1.66 2012/07/28 00:43:23 matt Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.65 2010/07/27 19:44:16 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.66 2012/07/28 00:43:23 matt Exp $");
#include "opt_ddb.h"
@@ -135,6 +135,7 @@
#endif
#ifdef NCR5380_DEBUG
+struct ncr5380_softc *ncr5380_debug_sc;
#define NCR_DBG_BREAK 1
#define NCR_DBG_CMDS 2
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/dev/ic/ncr5380var.h
--- a/sys/dev/ic/ncr5380var.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/dev/ic/ncr5380var.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.32 2008/04/04 16:00:58 tsutsui Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.33 2012/07/28 00:43:23 matt Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -236,7 +236,7 @@
void ncr5380_init(struct ncr5380_softc *);
#ifdef NCR5380_DEBUG
-struct ncr5380_softc *ncr5380_debug_sc;
+extern struct ncr5380_softc *ncr5380_debug_sc;
void ncr5380_trace(const char *msg, long val);
#define NCR_TRACE(msg, val) ncr5380_trace(msg, val)
#else /* NCR5380_DEBUG */
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/dev/if_ndis/if_ndis.c
--- a/sys/dev/if_ndis/if_ndis.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/dev/if_ndis/if_ndis.c Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ndis.c,v 1.32 2011/05/14 12:44:15 rmind Exp $ */
+/* $NetBSD: if_ndis.c,v 1.33 2012/07/28 00:43:23 matt Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.32 2011/05/14 12:44:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.33 2012/07/28 00:43:23 matt Exp $");
#endif
@@ -145,6 +145,8 @@
static void ndis_map_sclist (void *, bus_dma_segment_t *,
int, bus_size_t, int);
+int ndis_in_isr;
+
#ifdef _MODULE
static int ndisdrv_loaded = 0;
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/dev/if_ndis/if_ndisvar.h
--- a/sys/dev/if_ndis/if_ndisvar.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/dev/if_ndis/if_ndisvar.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ndisvar.h,v 1.7 2011/05/14 12:44:16 rmind Exp $ */
+/* $NetBSD: if_ndisvar.h,v 1.8 2012/07/28 00:43:23 matt Exp $ */
/*-
* Copyright (c) 2003
@@ -107,7 +107,7 @@
#endif
#ifdef __NetBSD__
-int ndis_in_isr;
+extern int ndis_in_isr;
#endif
struct ndis_softc {
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/fs/hfs/libhfs.c
--- a/sys/fs/hfs/libhfs.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/fs/hfs/libhfs.c Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libhfs.c,v 1.11 2012/06/15 21:59:39 joerg Exp $ */
+/* $NetBSD: libhfs.c,v 1.12 2012/07/28 00:43:23 matt Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: libhfs.c,v 1.11 2012/06/15 21:59:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: libhfs.c,v 1.12 2012/07/28 00:43:23 matt Exp $");
#include "libhfs.h"
@@ -66,6 +66,15 @@
extern uint32_t be32tohp(void** inout_ptr);
extern uint64_t be64tohp(void** inout_ptr);
+hfs_callbacks hfs_gcb; /* global callbacks */
+
+/*
+ * global case folding table
+ * (lazily initialized; see comments at bottom of hfs_open_volume())
+ */
+unichar_t* hfs_gcft;
+
+
int hfslib_create_casefolding_table(void);
#ifdef DLO_DEBUG
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/fs/hfs/libhfs.h
--- a/sys/fs/hfs/libhfs.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/fs/hfs/libhfs.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libhfs.h,v 1.5 2011/07/17 20:54:51 joerg Exp $ */
+/* $NetBSD: libhfs.h,v 1.6 2012/07/28 00:43:23 matt Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -587,13 +587,13 @@
} hfs_callbacks;
-hfs_callbacks hfs_gcb; /* global callbacks */
+extern hfs_callbacks hfs_gcb; /* global callbacks */
/*
* global case folding table
* (lazily initialized; see comments at bottom of hfs_open_volume())
*/
-unichar_t* hfs_gcft;
+extern unichar_t* hfs_gcft;
#if 0
#pragma mark -
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/fs/nilfs/nilfs.h
--- a/sys/fs/nilfs/nilfs.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/fs/nilfs/nilfs.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs.h,v 1.2 2011/09/27 01:34:41 christos Exp $ */
+/* $NetBSD: nilfs.h,v 1.3 2012/07/28 00:43:23 matt Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -101,7 +101,7 @@
MALLOC_DECLARE(M_NILFSMNT);
MALLOC_DECLARE(M_NILFSTEMP);
-struct pool nilfs_node_pool;
+extern struct pool nilfs_node_pool;
struct nilfs_node;
struct nilfs_mount;
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/kern/kgdb_stub.c
--- a/sys/kern/kgdb_stub.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/kern/kgdb_stub.c Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_stub.c,v 1.24 2011/04/03 22:29:28 dyoung Exp $ */
+/* $NetBSD: kgdb_stub.c,v 1.25 2012/07/28 00:43:24 matt Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -45,8 +45,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.24 2011/04/03 22:29:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_stub.c,v 1.25 2012/07/28 00:43:24 matt Exp $");
+#include "opt_ddb.h"
#include "opt_kgdb.h"
#include <sys/param.h>
@@ -92,7 +93,11 @@
* cases such as disabling hardware watchdogs while in kgdb. Name
* is shared with DDB.
*/
+#ifdef DDB
+extern void (*db_trap_callback)(int);
+#else
void (*db_trap_callback)(int);
+#endif
void kgdb_voidop(void);
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/net/if_etherip.c
--- a/sys/net/if_etherip.c Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/net/if_etherip.c Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_etherip.c,v 1.32 2012/06/02 21:36:47 dsl Exp $ */
+/* $NetBSD: if_etherip.c,v 1.33 2012/07/28 00:43:24 matt Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenfeld%grumpf.hope-2000.org@localhost>
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.32 2012/06/02 21:36:47 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.33 2012/07/28 00:43:24 matt Exp $");
#include "opt_inet.h"
@@ -134,6 +134,8 @@
#include <compat/sys/sockio.h>
+struct etherip_softc_list etherip_softc_list;
+
static int etherip_node;
static int etherip_sysctl_handler(SYSCTLFN_PROTO);
SYSCTL_SETUP_PROTO(sysctl_etherip_setup);
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/net/if_etherip.h
--- a/sys/net/if_etherip.h Sat Jul 28 00:42:47 2012 +0000
+++ b/sys/net/if_etherip.h Sat Jul 28 00:43:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_etherip.h,v 1.10 2008/11/12 12:36:28 ad Exp $ */
+/* $NetBSD: if_etherip.h,v 1.11 2012/07/28 00:43:24 matt Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenfeld%grumpf.hope-2000.org@localhost>
@@ -51,7 +51,8 @@
LIST_ENTRY(etherip_softc) etherip_list; /* list of etherip tunnels */
};
-LIST_HEAD(, etherip_softc) etherip_softc_list;
+LIST_HEAD(etherip_softc_list, etherip_softc);
+extern struct etherip_softc_list etherip_softc_list;
struct etherip_header {
uint8_t eip_ver; /* version/reserved */
diff -r 7694aa8f97e1 -r 0fe3953e22c9 sys/net/npf/npf_impl.h
--- a/sys/net/npf/npf_impl.h Sat Jul 28 00:42:47 2012 +0000
Home |
Main Index |
Thread Index |
Old Index