summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-09-03 20:18:19 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-09-03 20:18:19 +0000
commitacb3a83e12f3acd43c8b9c4728960d999d39dbff (patch)
tree3282a16c2a96e586854b83238c8793aefbd2d630
parent7bc483497b265ed060423c342644d3e6c7af6d7e (diff)
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...
-rw-r--r--sys/arch/mvme88k/mvme88k/trap.c5
1 files changed, 1 insertions, 4 deletions
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;