diff options
| author | gonzo <gonzo@FreeBSD.org> | 2012-03-26 21:22:51 +0000 |
|---|---|---|
| committer | gonzo <gonzo@FreeBSD.org> | 2012-03-26 21:22:51 +0000 |
| commit | 49e07e95592f6b458f4a4182401cb8317175e365 (patch) | |
| tree | e99407f354f627631e1586e8614ed7c500183557 /sys/cddl/dev/dtrace | |
| parent | 56f593829684b870c2901bea7de65ee82271ed9c (diff) | |
| download | FreeBSD-src-49e07e95592f6b458f4a4182401cb8317175e365.zip FreeBSD-src-49e07e95592f6b458f4a4182401cb8317175e365.tar.gz | |
Properly cast 64-bit dofhp_dof to pointer.
For i386 this change is no-op. For AMD64 it was tested with DTrace test
suite: results are the same from the test run before the change and after
Diffstat (limited to 'sys/cddl/dev/dtrace')
| -rw-r--r-- | sys/cddl/dev/dtrace/dtrace_ioctl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index 79fea7b..fbc891d 100644 --- a/sys/cddl/dev/dtrace/dtrace_ioctl.c +++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c @@ -39,11 +39,7 @@ dtrace_ioctl_helper(struct cdev *dev, u_long cmd, caddr_t addr, int flags, case DTRACEHIOC_ADDDOF: dhp = (dof_helper_t *)addr; /* XXX all because dofhp_dof is 64 bit */ -#ifdef __i386 - addr = (caddr_t)(uint32_t)dhp->dofhp_dof; -#else - addr = (caddr_t)dhp->dofhp_dof; -#endif + addr = (caddr_t)(vm_offset_t)dhp->dofhp_dof; /* FALLTHROUGH */ case DTRACEHIOC_ADD: dof = dtrace_dof_copyin((intptr_t)addr, &rval); |
