From 933fab9d731ce1e7d9bccbb5fae7eb60055583bf Mon Sep 17 00:00:00 2001 From: Oleksandr Tymoshenko Date: Mon, 26 Mar 2012 21:22:51 +0000 Subject: [PATCH] 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 --- sys/cddl/dev/dtrace/dtrace_ioctl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c index 79fea7bb79d..fbc891d444f 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);