Module Name: src
Committed By: maya
Date: Fri Dec 22 22:59:26 UTC 2017
Modified Files:
src/sys/arch/mips/mips: trap.c
Log Message:
Don't handle emulations overriding e_fault.
No existing emulations do this.
(COMPAT_IRIX did, but was removed)
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/mips/mips/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.244 src/sys/arch/mips/mips/trap.c:1.245
--- src/sys/arch/mips/mips/trap.c:1.244 Fri Jul 14 20:32:32 2017
+++ src/sys/arch/mips/mips/trap.c Fri Dec 22 22:59:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.244 2017/07/14 20:32:32 christos Exp $ */
+/* $NetBSD: trap.c,v 1.245 2017/12/22 22:59:25 maya Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.244 2017/07/14 20:32:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.245 2017/12/22 22:59:25 maya Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -391,11 +391,7 @@ trap(uint32_t status, uint32_t cause, va
onfault = pcb->pcb_onfault;
pcb->pcb_onfault = NULL;
- if (p->p_emul->e_fault) {
- rv = (*p->p_emul->e_fault)(p, va, ftype);
- } else {
- rv = uvm_fault(map, va, ftype);
- }
+ rv = uvm_fault(map, va, ftype);
pcb->pcb_onfault = onfault;
#if defined(VMFAULT_TRACE)
