diff options
| author | bde <bde@FreeBSD.org> | 2003-09-07 13:23:45 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-09-07 13:23:45 +0000 |
| commit | 216d4d73b86b21a3b12cf46fcbcc6fb0cc356a54 (patch) | |
| tree | 6af4225a183ac0f0e8f08ea16de89ec0e3b07410 | |
| parent | 7e8f143aca909c353a85674c6df574e00793c512 (diff) | |
| download | FreeBSD-src-216d4d73b86b21a3b12cf46fcbcc6fb0cc356a54.zip FreeBSD-src-216d4d73b86b21a3b12cf46fcbcc6fb0cc356a54.tar.gz | |
Restored non-egregious casts so that this file compiles on i386's with
64-bit longs again.
| -rw-r--r-- | sys/i386/linux/imgact_linux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 884bf3e..a599843 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -150,7 +150,7 @@ exec_linux_imgact(struct image_params *imgp) if (error) goto fail; - error = copyout((void *)(buffer + file_offset), + error = copyout((void *)(uintptr_t)(buffer + file_offset), (void *)vmaddr, a_out->a_text + a_out->a_data); vm_map_remove(kernel_map, buffer, @@ -224,8 +224,9 @@ exec_linux_imgact(struct image_params *imgp) /* Fill in process VM information */ vmspace->vm_tsize = round_page(a_out->a_text) >> PAGE_SHIFT; vmspace->vm_dsize = round_page(a_out->a_data + bss_size) >> PAGE_SHIFT; - vmspace->vm_taddr = (caddr_t)virtual_offset; - vmspace->vm_daddr = (caddr_t)(virtual_offset + a_out->a_text); + vmspace->vm_taddr = (caddr_t)(void *)(uintptr_t)virtual_offset; + vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t) + (virtual_offset + a_out->a_text); /* Fill in image_params */ imgp->interpreted = 0; |
