From 7d2ada5f795730a7439d97f6002eeb36bfeba9bb Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Tue, 5 Apr 1994 17:56:26 +0000
Subject: [PATCH] Various cleanup.

---
 sys/arch/i386/i386/machdep.c    | 13 ++++---------
 sys/arch/i386/i386/vm_machdep.c |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index dd4e06ec837c..fda657051790 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.92 1994/03/29 04:38:08 mycroft Exp $
+ *	$Id: machdep.c,v 1.93 1994/04/05 17:56:26 mycroft Exp $
  */
 
 #include <stddef.h>
@@ -449,13 +449,8 @@ sendsig(catcher, sig, mask, code)
 		 * Process has trashed its stack; give it an illegal
 		 * instruction to halt it in its tracks.
 		 */
-		SIGACTION(p, SIGILL) = SIG_DFL;
-		sig = sigmask(SIGILL);
-		p->p_sigignore &= ~sig;
-		p->p_sigcatch &= ~sig;
-		p->p_sigmask &= ~sig;
-		psignal(p, SIGILL);
-		return;
+		sigexit(p, SIGILL);
+		/* NOTREACHED */
 	}
 
 	/*
@@ -748,8 +743,8 @@ setregs(p, entry, stack, retval)
 	tf->tf_cs = _ucodesel;
 
 	p->p_addr->u_pcb.pcb_flags &= 0 /* FM_SYSCTRC */; /* no fp at all */
-	lcr0(rcr0() | CR0_TS);	/* start emulating */
 #if	NNPX > 0
+	npxexit();
 	npxinit(__INITIAL_NPXCW__);
 #endif
 
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 3b4e61f21ca7..835a68a16c8c 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -125,7 +125,7 @@ cpu_exit(p)
 	extern struct proc *npxproc;
 	
 	if (npxproc == p)
-		npxexit(p);
+		npxexit();
 #endif
 
 #ifdef USER_LDT