Make sure that L_SA_PAGEFAULT gets cleared from l_flag if pmap_fault_fixup

returns non-zero and we want to shortcut out.  This avoids a bogus pagefault
condition being detected in sa_switch().
Many thanks to Christian Limpach for finding this, obviating my band-aid
patch to kern_sa.c (posted on tech-kern).
This commit is contained in:
briggs 2003-11-14 21:22:08 +00:00
parent 296844fe72
commit dfa839f16b
1 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: fault.c,v 1.41 2003/11/14 19:00:03 scw Exp $ */ /* $NetBSD: fault.c,v 1.42 2003/11/14 21:22:08 briggs Exp $ */
/* /*
* Copyright 2003 Wasabi Systems, Inc. * Copyright 2003 Wasabi Systems, Inc.
@ -81,7 +81,7 @@
#include "opt_kgdb.h" #include "opt_kgdb.h"
#include <sys/types.h> #include <sys/types.h>
__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.41 2003/11/14 19:00:03 scw Exp $"); __KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.42 2003/11/14 21:22:08 briggs Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -390,8 +390,11 @@ data_abort_handler(trapframe_t *tf)
#ifdef DEBUG #ifdef DEBUG
last_fault_code = fsr; last_fault_code = fsr;
#endif #endif
if (pmap_fault_fixup(map->pmap, va, ftype, user)) if (pmap_fault_fixup(map->pmap, va, ftype, user)) {
if (map != kernel_map)
l->l_flag &= ~L_SA_PAGEFAULT;
goto out; goto out;
}
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (__predict_false(current_intr_depth > 0)) { if (__predict_false(current_intr_depth > 0)) {