More caddr_t removal, in conjunction with copy{in,out}(9) this time.

Also clean up some egregious casts and incorrect use of sizeof.

1 files changed, 4 insertions, 5 deletions

diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 176a858..bc32ba8 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -149,8 +149,8 @@ exec_linux_imgact(struct image_params *imgp)
 	if (error)
 	    goto fail;
 
-	error = copyout((caddr_t)(void *)(uintptr_t)(buffer + file_offset),
-			(caddr_t)vmaddr, a_out->a_text + a_out->a_data);
+	error = copyout((void *)(buffer + file_offset),
+	                (void *)vmaddr, a_out->a_text + a_out->a_data);
 
 	vm_map_remove(kernel_map, buffer,
 		      buffer + round_page(a_out->a_text + a_out->a_data + file_offset));
@@ -223,9 +223,8 @@ 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)(void *)(uintptr_t)virtual_offset;
-    vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t)
-	(virtual_offset + a_out->a_text);
+    vmspace->vm_taddr = (caddr_t)virtual_offset;
+    vmspace->vm_daddr = (caddr_t)(virtual_offset + a_out->a_text);
 
     /* Fill in image_params */
     imgp->interpreted = 0;