{x,}ldcontrolb() codepath is SUN4-only, so don't bother checking for Lfsbail

in mem_access_fault4m.

3 files changed, 9 insertions, 16 deletions

diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s
index 47907a9ca27..b40eda32e84 100644
--- a/sys/arch/sparc/sparc/locore.s
+++ b/sys/arch/sparc/sparc/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.69 2006/03/23 02:29:36 ray Exp $	*/
+/*	$OpenBSD: locore.s,v 1.70 2006/06/09 06:41:44 miod Exp $	*/
 /*	$NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $	*/
 
 /*
@@ -4867,6 +4867,8 @@ Lfserr:
 	retl				! and return error indicator
 	 mov	-1, %o0
 
+#ifdef SUN4
+
 	/*
 	 * This is just like Lfserr, but it's a global label that allows
 	 * mem_access_fault() to check to see that we don't want to try to
@@ -4894,6 +4896,9 @@ ENTRY(xldcontrolb)
 0:	retl
 	 st	%g0, [%o2 + PCB_ONFAULT]
 
+
+#endif	/* SUN4 */
+
 /*
  * copywords(src, dst, nbytes)
  *
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 82a8bf285ed..02fb40a56cb 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.107 2005/09/25 20:04:03 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.108 2006/06/09 06:41:44 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -1090,7 +1090,6 @@ oldmon_w_cmd(va, ar)
 		printf("w: arg not allowed\n");
 	}
 }
-#endif /* SUN4 */
 
 int
 ldcontrolb(addr)
@@ -1102,11 +1101,6 @@ caddr_t addr;
 	int res;
 	int s;
 
-	if (CPU_ISSUN4M) {
-		printf("warning: ldcontrolb called in sun4m\n");
-		return 0;
-	}
-
 	s = splhigh();
 	if (curproc == NULL)
 		xpcb = (struct pcb *)proc0paddr;
@@ -1120,3 +1114,4 @@ caddr_t addr;
 	splx(s);
 	return (res);
 }
+#endif /* SUN4 */
diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c
index 80ea6b1f571..e97adcdcfa3 100644
--- a/sys/arch/sparc/sparc/trap.c
+++ b/sys/arch/sparc/sparc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.47 2006/01/30 21:26:19 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.48 2006/06/09 06:41:44 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */
 
 /*
@@ -929,7 +929,6 @@ mem_access_fault4m(type, sfsr, sfva, tf)
 	/* Now munch on protections... */
 
 	if (psr & PSR_PS) {
-		extern char Lfsbail[];
 		if (sfsr & SFSR_AT_TEXT || type == T_TEXTFAULT) {
 			(void) splhigh();
 			printf("text fault: pc=0x%x sfsr=%b sfva=0x%x\n", pc,
@@ -937,12 +936,6 @@ mem_access_fault4m(type, sfsr, sfva, tf)
 			panic("kernel fault");
 			/* NOTREACHED */
 		}
-		/*
-		 * If this was an access that we shouldn't try to page in,
-		 * resume at the fault handler without any action.
-		 */
-		if (p->p_addr && p->p_addr->u_pcb.pcb_onfault == Lfsbail)
-			goto kfault;
 
 		/*
 		 * During autoconfiguration, faults are never OK unless