Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/sys/arch/usermode/usermode Pull up following revision(s) ...
details: https://anonhg.NetBSD.org/src/rev/3c09347bb9bc
branches: netbsd-6
changeset: 773898:3c09347bb9bc
user: riz <riz%NetBSD.org@localhost>
date: Thu Mar 08 17:21:20 2012 +0000
description:
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
diffstat:
sys/arch/usermode/usermode/trap.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diffs (39 lines):
diff -r 9d892a6840c5 -r 3c09347bb9bc sys/arch/usermode/usermode/trap.c
--- a/sys/arch/usermode/usermode/trap.c Wed Mar 07 23:45:14 2012 +0000
+++ b/sys/arch/usermode/usermode/trap.c Thu Mar 08 17:21:20 2012 +0000
@@ -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 <reinoud%netbsd.org@localhost>
@@ -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 @@
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 @@
}
+/*
+ * 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)
{
Home |
Main Index |
Thread Index |
Old Index