Remove the last of the MD netisr code. It is now all MI. Remove

spending, which was unused now that all software interrupts have
their own thread.  Make the legacy schednetisr use an atomic op
for setting bits in the netisr mask.

Reviewed by:	jhb

4 files changed, 0 insertions, 56 deletions

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 5c05929..a6f92b1 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -440,33 +440,6 @@ again:
 	cpu_setregs();
 }
 
-int
-register_netisr(num, handler)
-	int num;
-	netisr_t *handler;
-{
-	
-	if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
-		printf("register_netisr: bad isr number: %d\n", num);
-		return (EINVAL);
-	}
-	netisrs[num] = handler;
-	return (0);
-}
-
-int
-unregister_netisr(num)
-	int num;
-{
-
-	if (num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs)) ) {
-		printf("unregister_netisr: bad isr number: %d\n", num);
-		return (EINVAL);
-	}
-	netisrs[num] = NULL;
-	return (0);
-}
-
 /*
  * Send an interrupt to process.
  *
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index b99b9af..d514b29 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -252,8 +252,6 @@
 #define	__mtx_exit_giant_def		_mtx_exit_giant_def
 #define _mul64				mul64
 #define _net_imask			net_imask
-#define _netisr				netisr
-#define _netisrs			netisrs
 #define _nfs_diskless			nfs_diskless
 #define _nfs_diskless_valid		nfs_diskless_valid
 #define _normalize			normalize
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 312d313..5a2ed26 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -54,7 +54,6 @@ extern	char	kstack[];
 extern	int	need_pre_dma_flush;
 extern	int	need_post_dma_flush;
 #endif
-extern	void	(*netisrs[32]) __P((void));
 extern	int	nfs_diskless_valid;
 extern	void	(*ovbcopy_vector) __P((const void *from, void *to, size_t len));
 extern	char	sigcode[];
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index f5d4926..a079d2c 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -68,25 +68,6 @@ _softnet_imask:	.long	0
 	.globl	_softtty_imask
 _softtty_imask:	.long	0
 
-/* pending software interrupts */
-	.globl	_spending
-_spending:	.long	0
-
-/* set with bits for which queue to service */
-	.globl	_netisr
-_netisr:	.long	0
-
-	.globl _netisrs
-_netisrs:
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-	.long	dummynetisr, dummynetisr, dummynetisr, dummynetisr
-
 	.text
 
 /*
@@ -173,13 +154,6 @@ doreti_ast:
 	movb	$1,_intr_nesting_level	/* for doreti_next to decrement */
 	jmp	doreti_next
 
-	ALIGN_TEXT
-dummynetisr:
-	MCOUNT
-	ret	
-
-
-
 #ifdef APIC_IO
 #include "i386/isa/apic_ipl.s"
 #else