How about this one?
Not too sure about the syntax of the changelog.
Thanks!
Barry deFreese
2008-07-23 Barry deFreese <[EMAIL PROTECTED]>
* i386/i386/locore.h (copyinmsg, copyoutmsg):
Cast parameters as void* rather than vm_offset_t.
* i386/i386at/com.c (comportdeath): Cast port as ipc_port_t in
tty_portdeath call.
* i386/i386at/kd.c (kdportdeath): Likewise.
* i386/i386at/lpr.c (lprportdeath): Likewise.
* i386/i386at/kd_mouse.c (mouse_handle_byte): Cast param to wakeup() as
vm_offset_t.
* i386/intel/pmap.c (pmap_destroy): Cast arg 2 of kmem_free() to
vm_offset_t.
* i386/intel/pmap.h: Cast all arg 1 params to kvtophy() to vm_offset_t.
* ipc/ipc_kmsg.c: Remove casts from params to copyinmsg and
copyoutmsg calls.
* ipc/mach_msg.c: Likewise.
* kern/exceptions.c: Likewise.
* ipc/mach_msg.c: Remove casts from params to copyout calls.
* ipc/bootstrap.c: Likewise.
* kern/ipc_tt.c (mach_ports_register): Cast memory[i] as ipc_port_t in
assignment.
? INSTALL
? Makefile.in
? aclocal.m4
? autom4te.cache
? build-aux
? config.h.in
? configure
? doc/mach.info
? doc/mach.info-1
? doc/mach.info-2
? doc/stamp-vti
? doc/version.texi
Index: i386/i386/locore.h
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386/Attic/locore.h,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 locore.h
--- i386/i386/locore.h 20 Dec 2006 21:57:55 -0000 1.1.2.3
+++ i386/i386/locore.h 23 Jul 2008 04:35:49 -0000
@@ -26,11 +26,11 @@
extern int copyin (const void *userbuf, void *kernelbuf, size_t cn);
-extern int copyinmsg (vm_offset_t userbuf, vm_offset_t kernelbuf, size_t cn);
+extern int copyinmsg (const void *userbuf, void *kernelbuf, size_t cn);
extern int copyout (const void *kernelbuf, void *userbuf, size_t cn);
-extern int copyoutmsg (vm_offset_t kernelbuf, vm_offset_t userbuf, size_t cn);
+extern int copyoutmsg (const void *kernelbuf, void *userbuf, size_t cn);
extern int call_continuation (continuation_t continuation);
Index: i386/i386at/com.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/com.c,v
retrieving revision 1.3.2.6
diff -u -p -r1.3.2.6 com.c
--- i386/i386at/com.c 20 Jul 2008 17:05:37 -0000 1.3.2.6
+++ i386/i386at/com.c 23 Jul 2008 04:35:49 -0000
@@ -433,7 +433,7 @@ io_return_t comportdeath(dev, port)
dev_t dev;
mach_port_t port;
{
- return (tty_portdeath(&com_tty[minor(dev)], port));
+ return (tty_portdeath(&com_tty[minor(dev)], (ipc_port_t)port));
}
io_return_t
Index: i386/i386at/kd.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/kd.c,v
retrieving revision 1.5.2.15
diff -u -p -r1.5.2.15 kd.c
--- i386/i386at/kd.c 20 Jul 2008 17:05:38 -0000 1.5.2.15
+++ i386/i386at/kd.c 23 Jul 2008 04:35:50 -0000
@@ -590,7 +590,7 @@ kdportdeath(dev, port)
dev_t dev;
mach_port_t port;
{
- return (tty_portdeath(&kd_tty, port));
+ return (tty_portdeath(&kd_tty, (ipc_port_t)port));
}
/*ARGSUSED*/
Index: i386/i386at/kd_mouse.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/kd_mouse.c,v
retrieving revision 1.3.2.9
diff -u -p -r1.3.2.9 kd_mouse.c
--- i386/i386at/kd_mouse.c 20 Jul 2008 17:05:38 -0000 1.3.2.9
+++ i386/i386at/kd_mouse.c 23 Jul 2008 04:35:50 -0000
@@ -603,7 +603,7 @@ mouse_handle_byte(ch)
mousebuf[mousebufindex++] = ch;
if (mouse_char_wanted) {
mouse_char_wanted = FALSE;
- wakeup(&mousebuf);
+ wakeup((vm_offset_t)&mousebuf);
}
return;
}
Index: i386/i386at/lpr.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/i386at/Attic/lpr.c,v
retrieving revision 1.1.1.1.4.10
diff -u -p -r1.1.1.1.4.10 lpr.c
--- i386/i386at/lpr.c 20 Jul 2008 17:05:38 -0000 1.1.1.1.4.10
+++ i386/i386at/lpr.c 23 Jul 2008 04:35:50 -0000
@@ -202,7 +202,7 @@ lprportdeath(dev, port)
dev_t dev;
mach_port_t port;
{
- return (tty_portdeath(&lpr_tty[minor(dev)], port));
+ return (tty_portdeath(&lpr_tty[minor(dev)], (ipc_port_t)port));
}
io_return_t
Index: i386/intel/pmap.c
===================================================================
RCS file: /sources/hurd/gnumach/i386/intel/pmap.c,v
retrieving revision 1.4.2.19
diff -u -p -r1.4.2.19 pmap.c
--- i386/intel/pmap.c 18 Nov 2007 17:33:07 -0000 1.4.2.19
+++ i386/intel/pmap.c 23 Jul 2008 04:35:50 -0000
@@ -927,7 +927,7 @@ void pmap_destroy(p)
vm_object_unlock(pmap_object);
}
}
- kmem_free(kernel_map, p->dirbase, INTEL_PGBYTES);
+ kmem_free(kernel_map, (vm_offset_t)p->dirbase, INTEL_PGBYTES);
zfree(pmap_zone, (vm_offset_t) p);
}
Index: i386/intel/pmap.h
===================================================================
RCS file: /sources/hurd/gnumach/i386/intel/pmap.h,v
retrieving revision 1.2.2.6
diff -u -p -r1.2.2.6 pmap.h
--- i386/intel/pmap.h 20 Jul 2008 17:05:38 -0000 1.2.2.6
+++ i386/intel/pmap.h 23 Jul 2008 04:35:51 -0000
@@ -234,7 +234,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_off
/* \
* If this is the kernel pmap, switch to its page tables. \
*/ \
- set_dirbase(kvtophys(tpmap->dirbase)); \
+ set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase)); \
} \
else { \
/* \
@@ -252,7 +252,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_off
* No need to invalidate the TLB - the entire user pmap \
* will be invalidated by reloading dirbase. \
*/ \
- set_dirbase(kvtophys(tpmap->dirbase)); \
+ set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase)); \
\
/* \
* Mark that this cpu is using the pmap. \
@@ -341,7 +341,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_off
#define PMAP_ACTIVATE_USER(pmap, th, my_cpu) { \
register pmap_t tpmap = (pmap); \
\
- set_dirbase(kvtophys(tpmap->dirbase)); \
+ set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase)); \
if (tpmap != kernel_pmap) { \
tpmap->cpus_using = TRUE; \
} \
Index: ipc/ipc_kmsg.c
===================================================================
RCS file: /sources/hurd/gnumach/ipc/ipc_kmsg.c,v
retrieving revision 1.2.2.11
diff -u -p -r1.2.2.11 ipc_kmsg.c
--- ipc/ipc_kmsg.c 16 Jul 2008 00:51:03 -0000 1.2.2.11
+++ ipc/ipc_kmsg.c 23 Jul 2008 04:35:51 -0000
@@ -531,7 +531,7 @@ ipc_kmsg_get(msg, size, kmsgp)
ikm_init(kmsg, size);
}
- if (copyinmsg((char *) msg, (char *) &kmsg->ikm_header, size)) {
+ if (copyinmsg(msg, &kmsg->ikm_header, size)) {
ikm_free(kmsg);
return MACH_SEND_INVALID_DATA;
}
@@ -601,7 +601,7 @@ ipc_kmsg_put(msg, kmsg, size)
ikm_check_initialized(kmsg, kmsg->ikm_size);
- if (copyoutmsg((char *) &kmsg->ikm_header, (char *) msg, size))
+ if (copyoutmsg(&kmsg->ikm_header, msg, size))
mr = MACH_RCV_INVALID_DATA;
else
mr = MACH_MSG_SUCCESS;
Index: ipc/mach_msg.c
===================================================================
RCS file: /sources/hurd/gnumach/ipc/mach_msg.c,v
retrieving revision 1.2.2.9
diff -u -p -r1.2.2.9 mach_msg.c
--- ipc/mach_msg.c 30 Apr 2007 20:30:11 -0000 1.2.2.9
+++ ipc/mach_msg.c 23 Jul 2008 04:35:52 -0000
@@ -222,8 +222,8 @@ mach_msg_receive(msg, option, rcv_size,
assert(real_size > rcv_size);
- (void) copyout((vm_offset_t) &real_size,
- (vm_offset_t) &msg->msgh_size,
+ (void) copyout(&real_size,
+ &msg->msgh_size,
sizeof(mach_msg_size_t));
}
@@ -313,8 +313,8 @@ mach_msg_receive_continue(void)
assert(real_size > rcv_size);
- (void) copyout((vm_offset_t) &real_size,
- (vm_offset_t) &msg->msgh_size,
+ (void) copyout(&real_size,
+ &msg->msgh_size,
sizeof(mach_msg_size_t));
}
@@ -460,7 +460,7 @@ mach_msg_trap(msg, option, send_size, rc
ikm_cache() = IKM_NULL;
ikm_check_initialized(kmsg, IKM_SAVED_KMSG_SIZE);
- if (copyinmsg((vm_offset_t) msg, (vm_offset_t) &kmsg->ikm_header,
+ if (copyinmsg(msg, &kmsg->ikm_header,
send_size)) {
ikm_free(kmsg);
goto slow_get;
@@ -1244,7 +1244,7 @@ mach_msg_trap(msg, option, send_size, rc
ikm_check_initialized(kmsg, kmsg->ikm_size);
if ((kmsg->ikm_size != IKM_SAVED_KMSG_SIZE) ||
- copyoutmsg((vm_offset_t) &kmsg->ikm_header, (vm_offset_t) msg,
+ copyoutmsg(&kmsg->ikm_header, msg,
reply_size) ||
(ikm_cache() != IKM_NULL))
goto slow_put;
Index: kern/bootstrap.c
===================================================================
RCS file: /sources/hurd/gnumach/kern/bootstrap.c,v
retrieving revision 1.12.2.11
diff -u -p -r1.12.2.11 bootstrap.c
--- kern/bootstrap.c 17 Jul 2008 01:02:01 -0000 1.12.2.11
+++ kern/bootstrap.c 23 Jul 2008 04:35:52 -0000
@@ -435,7 +435,7 @@ read_exec(void *handle, vm_offset_t file
if (file_size > 0)
{
err = copyout((char *)phystokv (mod->mod_start) + file_ofs,
- mem_addr, file_size);
+ (void *)mem_addr, file_size);
assert(err == 0);
}
Index: kern/exception.c
===================================================================
RCS file: /sources/hurd/gnumach/kern/exception.c,v
retrieving revision 1.6.2.6
diff -u -p -r1.6.2.6 exception.c
--- kern/exception.c 16 Jul 2008 00:51:04 -0000 1.6.2.6
+++ kern/exception.c 23 Jul 2008 04:35:52 -0000
@@ -696,7 +696,7 @@ exception_raise(dest_port, thread_port,
ikm_check_initialized(kmsg, kmsg->ikm_size);
assert(kmsg->ikm_size == IKM_SAVED_KMSG_SIZE);
- if (copyoutmsg((vm_offset_t) &kmsg->ikm_header, (vm_offset_t)receiver->ith_msg,
+ if (copyoutmsg(&kmsg->ikm_header, receiver->ith_msg,
sizeof(struct mach_exception)) ||
(ikm_cache() != IKM_NULL)) {
mr = ipc_kmsg_put(receiver->ith_msg, kmsg,
Index: kern/ipc_tt.c
===================================================================
RCS file: /sources/hurd/gnumach/kern/ipc_tt.c,v
retrieving revision 1.3.2.5
diff -u -p -r1.3.2.5 ipc_tt.c
--- kern/ipc_tt.c 30 Apr 2007 20:30:11 -0000 1.3.2.5
+++ kern/ipc_tt.c 23 Jul 2008 04:35:52 -0000
@@ -833,7 +833,7 @@ mach_ports_register(
*/
for (i = 0; i < portsCnt; i++)
- ports[i] = memory[i];
+ ports[i] = (ipc_port_t)memory[i];
for (; i < TASK_PORT_REGISTER_MAX; i++)
ports[i] = IP_NULL;
