move netisr definition into md code to allow arch provide suitable allocation; tested on most archs

11 files changed, 35 insertions, 11 deletions

diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index ca8b8200a1c..5d0325b4e7a 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.14 2002/06/25 21:33:19 miod Exp $ */
+/* $OpenBSD: interrupt.c,v 1.15 2003/11/06 21:09:34 mickey Exp $ */
 /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */
 
 /*-
@@ -382,6 +382,8 @@ badaddr_read(void *addr, size_t size, void *rptr)
 	return (rv);
 }
 
+int netisr;
+
 void
 netintr()
 {
diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c
index de231a2fb47..0060f4e8def 100644
--- a/sys/arch/hp300/hp300/intr.c
+++ b/sys/arch/hp300/hp300/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.11 2002/04/28 15:15:32 miod Exp $	*/
+/*	$OpenBSD: intr.c,v 1.12 2003/11/06 21:09:34 mickey Exp $	*/
 /*	$NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $	*/
 
 /*-
@@ -283,6 +283,8 @@ intr_dispatch(evec)
 		printf("intr_dispatch: stray level %d interrupt\n", ipl);
 }
 
+int netisr;
+
 void
 netintr()
 {
diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s
index 3aff719725a..8bd2af133ca 100644
--- a/sys/arch/i386/isa/icu.s
+++ b/sys/arch/i386/isa/icu.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icu.s,v 1.19 2003/04/17 03:42:14 drahn Exp $	*/
+/*	$OpenBSD: icu.s,v 1.20 2003/11/06 21:09:34 mickey Exp $	*/
 /*	$NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $	*/
 
 /*-
@@ -37,6 +37,8 @@
 	.globl	_C_LABEL(astpending), _C_LABEL(netisr)
 _C_LABEL(imen):
 	.long	0xffff		# interrupt mask enable (all off)
+_C_LABEL(netisr):
+	.long	0		# scheduling bits for network
 
 	.text
 
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index e41b74c1593..1173c6081ea 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.107 2003/06/02 23:27:49 millert Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.108 2003/11/06 21:09:34 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -1021,6 +1021,8 @@ badladdr(addr)
 	return (0);
 }
 
+int netisr;
+
 void
 netintr()
 {
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 2cbc8d6e429..d8b38f6bc8a 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.63 2003/10/31 03:06:17 drahn Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.64 2003/11/06 21:09:35 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -803,6 +803,8 @@ softtty()
 #endif
 }
 
+int netisr;
+
 /*
  * Soft networking interrupts.
  */
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index cd6dd30bce5..2ca248d44e7 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.77 2003/06/02 23:27:51 millert Exp $ */
+/*	$OpenBSD: machdep.c,v 1.78 2003/11/06 21:09:35 mickey Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -1030,6 +1030,8 @@ badvaddr(addr, size)
 	return (0);
 }
 
+int netisr;
+
 void
 netintr(arg)
 	void *arg;
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 8ec5def0550..dfb450af84e 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.118 2003/10/24 17:44:51 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.119 2003/11/06 21:09:35 mickey Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -2141,6 +2141,8 @@ myetheraddr(cp)
 	bcopy(&brdid.etheraddr, cp, 6);
 }
 
+int netisr;
+
 void
 dosoftint()
 {
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index b5dbeea5552..4398f924c97 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.33 2003/09/22 21:39:40 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.34 2003/11/06 21:09:35 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -820,6 +820,7 @@ dumpsys()
 
 volatile int cpl, ipending, astpending, tickspending;
 int imask[7];
+int netisr;
 
 /*
  * Soft networking interrupts.
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index 3a113756911..27807c4559c 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.25 2003/06/23 19:19:33 miod Exp $ */
+/*	$OpenBSD: intr.c,v 1.26 2003/11/06 21:09:35 mickey Exp $ */
 /*	$NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */
 
 /*
@@ -103,6 +103,8 @@ strayintr(fp)
 static struct intrhand level10 = { clockintr, NULL, (IPL_CLOCK << 8) };
 static struct intrhand level14 = { statintr, NULL, (IPL_STATCLOCK << 8) };
 union sir sir;
+int netisr;
+
 /*
  * Level 1 software interrupt (could also be Sbus level 1 interrupt).
  * Three possible reasons:
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index 5c3e2ad1d98..72d0edb6b1c 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.18 2003/10/01 06:01:55 cloder Exp $	*/
+/*	$OpenBSD: intr.c,v 1.19 2003/11/06 21:09:35 mickey Exp $	*/
 /*	$NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */
 
 /*
@@ -138,6 +138,8 @@ softintr(fp)
 	return (1);
 }
 
+int netisr;
+
 int
 softnet(fp)
 	void *fp;
diff --git a/sys/arch/vax/vax/intvec.s b/sys/arch/vax/vax/intvec.s
index 588ee96f2a8..f9f37766c09 100644
--- a/sys/arch/vax/vax/intvec.s
+++ b/sys/arch/vax/vax/intvec.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intvec.s,v 1.15 2002/04/29 19:13:24 miod Exp $   */
+/*	$OpenBSD: intvec.s,v 1.16 2003/11/06 21:09:35 mickey Exp $   */
 /*	$NetBSD: intvec.s,v 1.39 1999/06/28 08:20:48 itojun Exp $   */
 
 /*
@@ -281,6 +281,11 @@ ENTRY(sbiflt);
 
 	FASTINTR(softclock,softclock)
 
+	.data
+	.global _netisr
+_netisr:
+	.long	0	# scheduling bits for network
+
 ENTRY(netint)
 	PUSHR
 /* XXX this relies on -traditional-cpp, since we can't use _C_LABEL here */