From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 16 Feb 2004 20:13:26 +0000 (+0000)
Subject: Remove common declaration for -fno-common
X-Git-Tag: v2.0.1~11994
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/ac40735cc3b38c447d04d9c2f29eb752153cea6a

Remove common declaration for -fno-common
---

diff --git a/sys/dev/raid/dpt/dpt.h b/sys/dev/raid/dpt/dpt.h
index d414754774..251c470398 100644
--- a/sys/dev/raid/dpt/dpt.h
+++ b/sys/dev/raid/dpt/dpt.h
@@ -41,7 +41,7 @@
 
 
 #ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.8.2.1 2000/08/07 18:48:14 peter Exp $"
-#ident "$DragonFly: src/sys/dev/raid/dpt/dpt.h,v 1.3 2003/11/22 19:30:55 asmodai Exp $"
+#ident "$DragonFly: src/sys/dev/raid/dpt/dpt.h,v 1.4 2004/02/16 20:13:26 dillon Exp $"
 
 #ifndef _DPT_H
 #define _DPT_H
@@ -227,7 +227,7 @@ typedef void *physaddr;
  * Beware of this enumeration.	Not all commands are in sequence!
  */
 
-enum {
+enum dpt_immediate_cmd {
     EATA_GENERIC_ABORT,
     EATA_SPECIFIC_RESET,
     EATA_BUS_RESET,
@@ -239,7 +239,9 @@ enum {
     EATA_SCSI_BUS_OFFLINE,
     EATA_RESET_MASKED_BUS,
     EATA_POWER_OFF_WARN
-} dpt_immediate_cmd;
+};
+
+extern enum dpt_immediate_cmd dpt_immediate_cmd;
 
 #define HA_CTRLREG		0x206 /* control register for HBA */
 #define HA_CTRL_DISINT		0x02  /* CTRLREG: disable interrupts */
@@ -277,7 +279,7 @@ enum {
  * Message definitions	
  */
 
-enum {
+enum dpt_message {
 	HA_NO_ERROR,		/* No Error				*/
 	HA_ERR_SEL_TO,		/* Selection Timeout			*/
 	HA_ERR_CMD_TO,		/* Command Timeout			*/
@@ -300,7 +302,9 @@ enum {
 	HA_PCI_MABORT,		/* PCI Master Abort			*/
 	HA_PCI_TABORT,		/* PCI Target Abort			*/
 	HA_PCI_STABORT		/* PCI Signaled Target Abort		*/
-} dpt_message;
+};
+
+extern enum dpt_message dpt_message;
 
 #define HA_STATUS_MASK  	0x7F
 #define HA_IDENTIFY_MSG 	0x80
diff --git a/sys/dev/raid/dpt/dpt_control.c b/sys/dev/raid/dpt/dpt_control.c
index 8a96f8a9d6..2523930323 100644
--- a/sys/dev/raid/dpt/dpt_control.c
+++ b/sys/dev/raid/dpt/dpt_control.c
@@ -37,7 +37,7 @@
  */
 
 #ident "$FreeBSD: src/sys/dev/dpt/dpt_control.c,v 1.16 1999/09/25 18:23:48 phk Exp $"
-#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.4 2003/08/07 21:17:08 dillon Exp $"
+#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.5 2004/02/16 20:13:26 dillon Exp $"
 
 #include "opt_dpt.h"
 
@@ -61,6 +61,9 @@
 
 extern char     osrelease[];
 
+enum dpt_message dpt_message;
+enum dpt_immediate_cmd dpt_immediate_cmd;
+
 static dpt_sysinfo_t   dpt_sysinfo;
 
 /* Entry points and other prototypes */
diff --git a/sys/i386/include/physio_proc.h b/sys/i386/include/physio_proc.h
index 97990a16ae..9f6a5f7159 100644
--- a/sys/i386/include/physio_proc.h
+++ b/sys/i386/include/physio_proc.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $	*/
-/*	$DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.6 2004/02/13 02:36:40 joerg Exp $	*/
+/*	$DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.7 2004/02/16 20:11:21 dillon Exp $	*/
 /*	$NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -39,7 +39,7 @@
 
 struct physio_proc;
 TAILQ_HEAD(physio_proc_head, physio_proc);
-struct physio_proc_head physio_proc_freet, physio_proc_busyt;
+extern struct physio_proc_head physio_proc_freet, physio_proc_busyt;
 
 struct physio_proc {
 	TAILQ_ENTRY(physio_proc) pp_chain;
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index f17de140fa..41753ff024 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -17,7 +17,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/kern/kern_physio.c,v 1.46.2.4 2003/11/14 09:51:47 simokawa Exp $
- * $DragonFly: src/sys/kern/kern_physio.c,v 1.7 2004/02/10 00:50:03 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_physio.c,v 1.8 2004/02/16 20:11:20 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -31,6 +31,11 @@
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
+#include <machine/physio_proc.h>
+
+/* I have no idea what this is used for */
+struct physio_proc_head physio_proc_freet, physio_proc_busyt;
+
 static void
 physwakeup(struct buf *bp)
 {
diff --git a/sys/platform/pc32/include/physio_proc.h b/sys/platform/pc32/include/physio_proc.h
index c23a9da3ab..b9461941b3 100644
--- a/sys/platform/pc32/include/physio_proc.h
+++ b/sys/platform/pc32/include/physio_proc.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $	*/
-/*	$DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.6 2004/02/13 02:36:40 joerg Exp $	*/
+/*	$DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.7 2004/02/16 20:11:21 dillon Exp $	*/
 /*	$NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -39,7 +39,7 @@
 
 struct physio_proc;
 TAILQ_HEAD(physio_proc_head, physio_proc);
-struct physio_proc_head physio_proc_freet, physio_proc_busyt;
+extern struct physio_proc_head physio_proc_freet, physio_proc_busyt;
 
 struct physio_proc {
 	TAILQ_ENTRY(physio_proc) pp_chain;