Module Name: src
Committed By: martin
Date: Thu Sep 12 19:50:47 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga [netbsd-10]: trap.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #845):
sys/arch/amiga/amiga/trap.c: revision 1.143
Don't panic on NULL pointer dereference when done by copyin, ...
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.139.20.1 src/sys/arch/amiga/amiga/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/amiga/amiga/trap.c
diff -u src/sys/arch/amiga/amiga/trap.c:1.139 src/sys/arch/amiga/amiga/trap.c:1.139.20.1
--- src/sys/arch/amiga/amiga/trap.c:1.139 Mon Aug 10 10:51:21 2020
+++ src/sys/arch/amiga/amiga/trap.c Thu Sep 12 19:50:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.139 2020/08/10 10:51:21 rin Exp $ */
+/* $NetBSD: trap.c,v 1.139.20.1 2024/09/12 19:50:47 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.139 2020/08/10 10:51:21 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.139.20.1 2024/09/12 19:50:47 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -363,7 +363,7 @@ trapmmufault(int type, u_int code, u_int
ftype = VM_PROT_READ;
va = trunc_page((vaddr_t)v);
#ifdef DEBUG
- if (map == kernel_map && va == 0) {
+ if (map == kernel_map && va == 0 && onfault == 0) {
printf("trap: bad kernel access at %x pc %x\n", v, fp->f_pc);
panictrap(type, code, v, fp);
}
