summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2003-09-07 13:03:13 +0000
committerbde <bde@FreeBSD.org>2003-09-07 13:03:13 +0000
commit8319013e497464034404727970f4641a06a0411e (patch)
tree2e6ac277990216b164f9255eab99fc24ea8c9035 /sys
parent158b38338d9a9808698eb6a5e8b8740c6b7b098c (diff)
downloadFreeBSD-src-8319013e497464034404727970f4641a06a0411e.zip
FreeBSD-src-8319013e497464034404727970f4641a06a0411e.tar.gz
Restored a non-egregious cast so that this file compiles on i386's
with 64-bit longs again. This was fixed in rev.1.42 but the fix rotted non-fatally in rev.1.105 and fatally in rev.1.137. Many more non-egregrious casts are strictly required for conversions from semi-opaque types to pointers, but we avoid most of them by using types that are almost certain to be compatible with uintptr_t for representing pointers (e.g., vm_offset_t). Here we don't really want the u_longs, but we have them because a.out.h and its support code doesn't use typedefs (it uses unsigned in V7 and unsigned long in FreeBSD) and is too obsolete to fix now.
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/linux/linux_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 5797700..f271482 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -416,7 +416,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
goto cleanup;
/* copy from kernel VM space to user space */
- error = copyout((void *)(buffer + file_offset),
+ error = copyout((void *)(uintptr_t)(buffer + file_offset),
(void *)vmaddr, a_out->a_text + a_out->a_data);
/* release temporary kernel space */
OpenPOWER on IntegriCloud