From 0894f4a92cc07e6a35a8bfb19ec29377627a4e64 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 11 Oct 1999 15:15:45 +0000
Subject: [PATCH] Clean up some cruft.  We don't run <= 4.3 binaries on hp300
 or luna68k arches using owait(2).

---
 sys/kern/kern_exit.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index acdc299e05c1..ccb6a02b98e5 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -62,10 +62,6 @@
 #include <sys/aio.h>
 #include <sys/jail.h>
 
-#ifdef COMPAT_43
-#include <machine/reg.h>
-#include <machine/psl.h>
-#endif
 #include <machine/limits.h>	/* for UCHAR_MAX = typeof(p_priority)_MAX */
 
 #include <vm/vm.h>
@@ -367,13 +363,6 @@ exit1(p, rv)
 }
 
 #ifdef COMPAT_43
-#if defined(hp300) || defined(luna68k)
-#include <machine/frame.h>
-#define GETPS(rp)	((struct frame *)(rp))->f_sr
-#else
-#define GETPS(rp)	(rp)[PS]
-#endif
-
 int
 owait(p, uap)
 	struct proc *p;
@@ -383,18 +372,8 @@ owait(p, uap)
 {
 	struct wait_args w;
 
-#ifdef PSL_ALLCC
-	if ((GETPS(p->p_md.md_regs) & PSL_ALLCC) != PSL_ALLCC) {
-		w.options = 0;
-		w.rusage = NULL;
-	} else {
-		w.options = p->p_md.md_regs[R0];
-		w.rusage = (struct rusage *)p->p_md.md_regs[R1];
-	}
-#else
 	w.options = 0;
 	w.rusage = NULL;
-#endif
 	w.pid = WAIT_ANY;
 	w.status = NULL;
 	return (wait1(p, &w, 1));