summaryrefslogtreecommitdiffstats
path: root/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2014-12-23 15:38:19 +0000
committermarkj <markj@FreeBSD.org>2014-12-23 15:38:19 +0000
commit7ea63e4fb49b9fd6e09141a3b07ab5137e249a08 (patch)
treed6778eb5fb483953bf06a32dbffc3c9ff0294312 /sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
parent5130d48f9c63ccf0aa81c3b9272eb734601d088e (diff)
downloadFreeBSD-src-7ea63e4fb49b9fd6e09141a3b07ab5137e249a08.zip
FreeBSD-src-7ea63e4fb49b9fd6e09141a3b07ab5137e249a08.tar.gz
Restore the trap type argument to the DTrace trap hook, removed in r268600.
It's redundant at the moment since it can be obtained from the trapframe on the architectures where DTrace is supported, but this won't be the case with ARM.
Diffstat (limited to 'sys/cddl/dev/dtrace/powerpc/dtrace_subr.c')
-rw-r--r--sys/cddl/dev/dtrace/powerpc/dtrace_subr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c b/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
index 5411ece..a89f1d3 100644
--- a/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
@@ -262,8 +262,9 @@ dtrace_gethrestime(void)
/* Function to handle DTrace traps during probes. See powerpc/powerpc/trap.c */
int
-dtrace_trap(struct trapframe *frame)
+dtrace_trap(struct trapframe *frame, u_int type)
{
+
/*
* A trap can occur while DTrace executes a probe. Before
* executing the probe, DTrace blocks re-scheduling and sets
@@ -278,7 +279,7 @@ dtrace_trap(struct trapframe *frame)
* There are only a couple of trap types that are expected.
* All the rest will be handled in the usual way.
*/
- switch (frame->exc) {
+ switch (type) {
/* Page fault. */
case EXC_DSI:
case EXC_DSE:
OpenPOWER on IntegriCloud