Module Name: src
Committed By: skrll
Date: Wed Mar 24 12:56:30 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: trap.c
Log Message:
Correct the list of traps that we need to get the va and space from
ii[os]q.
>From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/hppa/hppa/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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.83 src/sys/arch/hppa/hppa/trap.c:1.84
--- src/sys/arch/hppa/hppa/trap.c:1.83 Mon Mar 22 23:29:11 2010
+++ src/sys/arch/hppa/hppa/trap.c Wed Mar 24 12:56:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.83 2010/03/22 23:29:11 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.84 2010/03/24 12:56:30 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.83 2010/03/22 23:29:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.84 2010/03/24 12:56:30 skrll Exp $");
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -498,8 +498,10 @@
trapnum = type & ~T_USER;
opcode = frame->tf_iir;
- if (trapnum == T_ITLBMISS || trapnum == T_ITLBMISSNA ||
- trapnum == T_IBREAK || trapnum == T_TAKENBR) {
+
+ if (trapnum <= T_EXCEPTION || trapnum == T_HIGHERPL ||
+ trapnum == T_LOWERPL || trapnum == T_TAKENBR ||
+ trapnum == T_IDEBUG || trapnum == T_PERFMON) {
va = frame->tf_iioq_head;
space = frame->tf_iisq_head;
vftype = VM_PROT_EXECUTE;