From acb3a83e12f3acd43c8b9c4728960d999d39dbff Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Wed, 3 Sep 2003 20:18:19 +0000
Subject: I'm walking on very, very thin ice here. Still trying to get the
 ``special'' DAE to pass; the first fix was too brutal, the second one too
 shy; this third one is apparently just in the middle to make everything happy
 so far...

---
 sys/arch/mvme88k/mvme88k/trap.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index 56a021472af..69234940439 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.46 2003/09/03 14:48:57 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.47 2003/09/03 20:18:18 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -457,11 +457,9 @@ user_fault:
 
 		/* Call uvm_fault() to resolve non-bus error faults */
 		switch (pbus_type) {
-#if 0
 		case CMMU_PFSR_SUCCESS:
 			result = 0;
 			break;
-#endif
 		case CMMU_PFSR_BERROR:
 			result = EACCES;
 			break;
@@ -514,7 +512,6 @@ user_fault:
 			 * (behaviour experienced on MVME187C)
 			 */
 			if (va == 0 && type == (T_DATAFLT + T_USER) &&
-			    pbus_type == CMMU_PFSR_PFAULT &&
 			    SYSTEMMODE(frame->epsr)) {
 				frame->dpfsr = 0;
 				frame->dmt0 = 0;
-- 
cgit v1.2.3