Module Name: src
Committed By: riz
Date: Thu Mar 8 17:21:20 UTC 2012
Modified Files:
src/sys/arch/usermode/usermode [netbsd-6]: trap.c
Log Message:
Pull up following revision(s) (requested by reinoud in ticket #91):
sys/arch/usermode/usermode/trap.c: revision 1.65
Use the signal's signo instead of just returning SIGSEGV and add a comment
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/arch/usermode/usermode/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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.63.2.1 src/sys/arch/usermode/usermode/trap.c:1.63.2.2
--- src/sys/arch/usermode/usermode/trap.c:1.63.2.1 Wed Mar 7 23:44:23 2012
+++ src/sys/arch/usermode/usermode/trap.c Thu Mar 8 17:21:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.63.2.1 2012/03/07 23:44:23 riz Exp $ */
+/* $NetBSD: trap.c,v 1.63.2.2 2012/03/08 17:21:20 riz Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63.2.1 2012/03/07 23:44:23 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63.2.2 2012/03/08 17:21:20 riz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -480,7 +480,7 @@ pagefault(siginfo_t *info, vaddr_t from_
KASSERT(from_userland);
KSI_INIT_TRAP(&ksi);
- ksi.ksi_signo = SIGSEGV;
+ ksi.ksi_signo = info->si_signo;
ksi.ksi_trap = 0; /* XXX */
ksi.ksi_code = (error == EPERM) ? SEGV_ACCERR : SEGV_MAPERR;
ksi.ksi_addr = (void *) va;
@@ -552,6 +552,11 @@ illegal_instruction(siginfo_t *info, vad
}
+/*
+ * handle pass to userland signals
+ *
+ * arguments other than the origional siginfo_t are not used
+ */
static void
pass_on(siginfo_t *info, vaddr_t from_userland, vaddr_t pc, vaddr_t va)
{
