Nuke commons.

3 files changed, 14 insertions, 18 deletions

diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 4eb71d2a6ee..28822126337 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2004/09/20 15:10:35 pefo Exp $ */
+/*	$OpenBSD: intr.h,v 1.7 2004/09/21 05:51:15 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -135,11 +135,11 @@ void clearsoftnet(void);
 void clearsofttty(void);
 #endif
 
+extern volatile intrmask_t cpl;
+extern volatile intrmask_t ipending;
+extern volatile intrmask_t astpending;
 
-volatile intrmask_t cpl;
-volatile intrmask_t ipending, astpending;
-
-intrmask_t imask[NIPLS];
+extern intrmask_t imask[NIPLS];
 
 /*
  *  A note on clock interrupts. Clock interrupts are always
@@ -154,7 +154,7 @@ static __inline void splx(int newcpl);
 static __inline int spllower(int newcpl);
 
 typedef void  (void_f) (void);
-void_f *pending_hand;
+extern void_f *pending_hand;
 
 static __inline void
 register_pending_int_handler(void(*pending)(void))
@@ -224,6 +224,8 @@ struct intrhand {
 	void	*frame;
 };
 
+extern struct intrhand *intrhand[INTMASKSIZE];
+
 /*
  * Low level interrupt dispatcher registration data.
  */
@@ -231,13 +233,8 @@ struct intrhand {
 
 struct trap_frame;
 
-struct {
-	intrmask_t int_mask;
-	intrmask_t (*int_hand)(intrmask_t, struct trap_frame *);
-} cpu_int_tab[NLOWINT];
-
-intrmask_t idle_mask;
-int	last_low_int;
+extern intrmask_t idle_mask;
+extern int last_low_int;
 
 void set_intr(int, intrmask_t, intrmask_t(*)(intrmask_t, struct trap_frame *));
 
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index b65e5bbf8a8..7bd0bbcdf08 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macebus.c,v 1.7 2004/09/20 10:31:16 pefo Exp $ */
+/*	$OpenBSD: macebus.c,v 1.8 2004/09/21 05:51:15 miod Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -438,7 +438,6 @@ intrmask_t mace_intem = 0x0;
 static intrmask_t intrtype[INTMASKSIZE];
 static intrmask_t intrmask[INTMASKSIZE];
 static intrmask_t intrlevel[INTMASKSIZE];
-struct intrhand *intrhand[INTMASKSIZE];
 
 static int fakeintr __P((void *));
 static int fakeintr(void *a) {return 0;}
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index aabb33d0e2f..af255ce90d0 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.12 2004/09/20 10:31:16 pefo Exp $ */
+/*	$OpenBSD: machdep.c,v 1.13 2004/09/21 05:51:15 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -116,7 +116,6 @@ int	bufpages = BUFPAGES;
 vm_map_t exec_map;
 vm_map_t phys_map;
 
-int	msgbufmapped;		/* set when safe to use msgbuf */
 caddr_t	msgbufbase;
 
 int	physmem;		/* max supported memory, changes to actual */
@@ -263,7 +262,7 @@ mips_init(int argc, int32_t *argv)
 			continue;	/* Outside kernel */
 		}
 
-		if (fp > firstkernpage) 
+		if (fp > firstkernpage)
 			fp = lastkernpage + 1;
 		else if (lp < lastkernpage)
 			lp = firstkernpage - 1;
@@ -855,6 +854,7 @@ dumpconf()
 void
 dumpsys()
 {
+	extern int msgbufmapped;
 
 	msgbufmapped = 0;
 	if (dumpdev == NODEV)