Remove softast; it's no longer used.

ok krw@

7 files changed, 12 insertions, 38 deletions

diff --git a/sys/arch/i386/i386/apicvec.s b/sys/arch/i386/i386/apicvec.s
index 9980af6d813..122c82d1aa4 100644
--- a/sys/arch/i386/i386/apicvec.s
+++ b/sys/arch/i386/i386/apicvec.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: apicvec.s,v 1.12 2008/04/25 19:50:07 kettenis Exp $ */
+/* $OpenBSD: apicvec.s,v 1.13 2008/04/26 14:33:27 kettenis Exp $ */
 /* $NetBSD: apicvec.s,v 1.1.2.2 2000/02/21 21:54:01 sommerfeld Exp $ */
 
 /*-
@@ -161,7 +161,7 @@ XINTR(ltimer):
 #endif
 	jmp	_C_LABEL(Xdoreti)
 
-	.globl	XINTR(softclock), XINTR(softnet), XINTR(softtty), XINTR(softast)
+	.globl	XINTR(softclock), XINTR(softnet), XINTR(softtty)
 XINTR(softclock):
 	pushl	$0
 	pushl	$T_ASTFLT
@@ -229,18 +229,6 @@ XINTR(softtty):
 #endif
 	jmp	_C_LABEL(Xdoreti)
 
-XINTR(softast):
-	pushl	$0
-	pushl	$T_ASTFLT
-	INTRENTRY
-	MAKE_FRAME
-	pushl	CPL
-	movl	$IPL_SOFTAST,CPL
-	andl	$~(1<<SIR_AST),CPUVAR(IPENDING)
-	ioapic_asm_ack()
-	sti
-	jmp	_C_LABEL(Xdoreti)
-
 #if NIOAPIC > 0
 
 #define voidop(num)
diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c
index 46e3fa6a277..a83a8b7421c 100644
--- a/sys/arch/i386/i386/lapic.c
+++ b/sys/arch/i386/i386/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.21 2008/04/18 20:20:35 kettenis Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.22 2008/04/26 14:33:27 kettenis Exp $	*/
 /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
 
 /*-
@@ -119,7 +119,6 @@ lapic_set_softvectors(void)
 	idt_vec_set(LAPIC_SOFTCLOCK_VECTOR, Xintrsoftclock);
 	idt_vec_set(LAPIC_SOFTNET_VECTOR, Xintrsoftnet);
 	idt_vec_set(LAPIC_SOFTTTY_VECTOR, Xintrsofttty);
-	idt_vec_set(LAPIC_SOFTAST_VECTOR, Xintrsoftast);
 }
 
 void
diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s
index 3772352dae1..bf38ed5c78f 100644
--- a/sys/arch/i386/i386/vector.s
+++ b/sys/arch/i386/i386/vector.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vector.s,v 1.11 2008/04/25 19:50:08 kettenis Exp $	*/
+/*	$OpenBSD: vector.s,v 1.12 2008/04/26 14:33:27 kettenis Exp $	*/
 /*	$NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $	*/
 
 /*
@@ -241,9 +241,8 @@ IDTVEC(resume)
 	.long	_C_LABEL(Xresume_legacy12), _C_LABEL(Xresume_legacy13)
 	.long	_C_LABEL(Xresume_legacy14), _C_LABEL(Xresume_legacy15)
 	/* for soft interrupts */
-	.long	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	.long	_C_LABEL(Xsoftast), _C_LABEL(Xsofttty) 
-	.long	_C_LABEL(Xsoftnet), _C_LABEL(Xsoftclock)
+	.long	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	.long	_C_LABEL(Xsofttty), _C_LABEL(Xsoftnet), _C_LABEL(Xsoftclock)
 	.long	0, 0
 /* fake interrupts to resume from splx() */
 IDTVEC(recurse)
@@ -256,7 +255,6 @@ IDTVEC(recurse)
 	.long	_C_LABEL(Xrecurse_legacy12), _C_LABEL(Xrecurse_legacy13)
 	.long	_C_LABEL(Xrecurse_legacy14), _C_LABEL(Xrecurse_legacy15)
 	/* for soft interrupts */
-	.long	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	.long	_C_LABEL(Xsoftast), _C_LABEL(Xsofttty) 
-	.long	_C_LABEL(Xsoftnet), _C_LABEL(Xsoftclock)
+	.long	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	.long	_C_LABEL(Xsofttty), _C_LABEL(Xsoftnet), _C_LABEL(Xsoftclock)
 	.long	0, 0
diff --git a/sys/arch/i386/include/i82489var.h b/sys/arch/i386/include/i82489var.h
index 03ce41551b7..8e13768fe75 100644
--- a/sys/arch/i386/include/i82489var.h
+++ b/sys/arch/i386/include/i82489var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82489var.h,v 1.7 2008/04/18 20:20:35 kettenis Exp $	*/
+/*	$OpenBSD: i82489var.h,v 1.8 2008/04/26 14:33:27 kettenis Exp $	*/
 /*	$NetBSD: i82489var.h,v 1.1.2.2 2000/02/21 18:46:14 sommerfeld Exp $	*/
 
 /*-
@@ -102,7 +102,6 @@ extern void Xintrltimer(void);
 #define LAPIC_SOFTCLOCK_VECTOR		IPL_SOFTCLOCK
 #define LAPIC_SOFTNET_VECTOR		IPL_SOFTNET
 #define LAPIC_SOFTTTY_VECTOR		IPL_SOFTTTY
-#define LAPIC_SOFTAST_VECTOR		IPL_SOFTAST
 
 /*
  * Special IPI vectors. We can use IDT 0xf0 - 0xff for this.
@@ -119,7 +118,6 @@ extern void Xintripi_invlrange(void);
 extern void Xintrsoftclock(void);
 extern void Xintrsoftnet(void);
 extern void Xintrsofttty(void);
-extern void Xintrsoftast(void);
 
 extern void (*apichandler[])(void);
 
diff --git a/sys/arch/i386/include/intrdefs.h b/sys/arch/i386/include/intrdefs.h
index 474fecf591c..8b81a124db4 100644
--- a/sys/arch/i386/include/intrdefs.h
+++ b/sys/arch/i386/include/intrdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intrdefs.h,v 1.10 2008/04/18 20:20:35 kettenis Exp $	*/
+/*	$OpenBSD: intrdefs.h,v 1.11 2008/04/26 14:33:27 kettenis Exp $	*/
 /*	$NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $	*/
 
 #ifndef _i386_INTRDEFS_H
@@ -56,7 +56,6 @@
  * The level numbers are picked to fit into APIC vector priorities.
  */
 #define	IPL_NONE	0		/* nothing */
-#define IPL_SOFTAST	MAKEIPL(0)	/* AST */
 #define	IPL_SOFTCLOCK	MAKEIPL(1)	/* timeouts */
 #define	IPL_SOFTNET	MAKEIPL(2)	/* protocol stacks */
 #define	IPL_BIO		MAKEIPL(3)	/* block I/O */
@@ -88,7 +87,6 @@
 #define	SIR_CLOCK	29
 #define	SIR_NET		28
 #define	SIR_TTY		27
-#define SIR_AST		26
 
 
 /*
diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s
index 87c4bdd074a..5b448e0781e 100644
--- a/sys/arch/i386/isa/icu.s
+++ b/sys/arch/i386/isa/icu.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icu.s,v 1.26 2008/04/25 19:50:08 kettenis Exp $	*/
+/*	$OpenBSD: icu.s,v 1.27 2008/04/26 14:33:27 kettenis Exp $	*/
 /*	$NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $	*/
 
 /*-
@@ -121,12 +121,6 @@ IDTVEC(doreti)
 
 #include "pccom.h"
 
-IDTVEC(softast)
-	movl	$IPL_SOFTAST,%eax
-	movl	%eax,CPL
-	sti
-	jmp	*%esi
-
 IDTVEC(softtty)
 #if NPCCOM > 0
 	movl	$IPL_SOFTTTY,%eax
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index c4fa51806e0..4cffe06f037 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.61 2007/09/07 15:00:19 art Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.62 2008/04/26 14:33:27 kettenis Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 /*-
@@ -296,7 +296,6 @@ intr_calculatemasks(void)
 	/*
 	 * Initialize soft interrupt masks to block themselves.
 	 */
-	IMASK(IPL_SOFTAST) |= 1 << SIR_AST;
 	IMASK(IPL_SOFTCLOCK) |= 1 << SIR_CLOCK;
 	IMASK(IPL_SOFTNET) |= 1 << SIR_NET;
 	IMASK(IPL_SOFTTTY) |= 1 << SIR_TTY;