diff options
author | rodrigc <rodrigc@FreeBSD.org> | 2008-11-05 19:39:11 +0000 |
---|---|---|
committer | rodrigc <rodrigc@FreeBSD.org> | 2008-11-05 19:39:11 +0000 |
commit | 8cd2060f99cc7bcf056f242b0b5056d3057ae325 (patch) | |
tree | c17c94a6b9337a7ed2154598bbff7c69d6d1438f /sys/cddl/dev/dtrace/dtrace_ioctl.c | |
parent | a7a8ae428de1ce96015914b05370d6d44a57d9ad (diff) | |
download | FreeBSD-src-8cd2060f99cc7bcf056f242b0b5056d3057ae325.zip FreeBSD-src-8cd2060f99cc7bcf056f242b0b5056d3057ae325.tar.gz |
Merge latest DTrace changes from Perforce.
Diffstat (limited to 'sys/cddl/dev/dtrace/dtrace_ioctl.c')
-rw-r--r-- | sys/cddl/dev/dtrace/dtrace_ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index 3866c3d..bc408c4 100644 --- a/sys/cddl/dev/dtrace/dtrace_ioctl.c +++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c @@ -32,7 +32,12 @@ static int dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags __unused, struct thread *td) { +#if __FreeBSD_version < 800039 dtrace_state_t *state = dev->si_drv1; +#else + dtrace_state_t *state; + devfs_get_cdevpriv((void **) &state); +#endif int error = 0; if (state == NULL) return (EINVAL); |