summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorbmc <none@none>2006-11-02 12:46:05 -0800
committerbmc <none@none>2006-11-02 12:46:05 -0800
commit9eea9bbfb263cd89aa3e242833133de852b0181c (patch)
treefaa5b2df9c04e752039505937d1a6e67caf67694 /usr/src
parent1110f3841973f8fb3cb09627c9330e198c6df3f5 (diff)
downloadillumos-joyent-9eea9bbfb263cd89aa3e242833133de852b0181c.tar.gz
6478725 dtrace_load* are no longer as safe as they used to be.
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/dtrace/dtrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c
index 256341945f..d55f9be64b 100644
--- a/usr/src/uts/common/dtrace/dtrace.c
+++ b/usr/src/uts/common/dtrace/dtrace.c
@@ -408,7 +408,7 @@ dtrace_load##bits(uintptr_t addr) \
rval = *((volatile uint##bits##_t *)addr); \
*flags &= ~CPU_DTRACE_NOFAULT; \
\
- return (rval); \
+ return (!(*flags & CPU_DTRACE_FAULT) ? rval : 0); \
}
#ifdef _LP64