summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--device/dev_pager.c6
-rw-r--r--i386/i386/debug_i386.c2
-rw-r--r--i386/i386/trap.c2
-rw-r--r--i386/i386at/com.c2
-rw-r--r--ipc/ipc_notify.c12
-rw-r--r--kern/ipc_kobject.c2
-rw-r--r--kern/sched_prim.c2
-rw-r--r--linux/pcmcia-cs/clients/smc91c92_cs.c2
-rw-r--r--linux/src/drivers/net/sundance.c2
-rw-r--r--vm/vm_fault.c2
-rw-r--r--vm/vm_map.c2
-rw-r--r--vm/vm_object.c2
13 files changed, 36 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index cdc15ddb..9af559d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,23 @@
* kern/bootstrap.c: Include <ipc/mach_port.h>.
* kern/ipc_mig.c: Likewise.
* kern/syscall_sw.c: Likewise.
+ * device/dev_pager.c (device_pager_data_request,
+ device_pager_data_request_done, device_pager_init_pager): Fix printf
+ formats.
+ * i386/i386/debug_i386.c (dump_ss): Likewise.
+ * i386/i386/trap.c (user_trap): Likewise.
+ * i386/i386at/com.c (comtimer): Likewise.
+ * ipc/ipc_notify (ipc_notify_port_deleted, ipc_notify_msg_accepted,
+ ipc_notify_port_destroyed, ipc_notify_no_senders,
+ ipc_notify_send_once, ipc_notify_dead_name): Likewise.
+ * kern/ipc_kobject.c (ipc_kobject_destroy): Likewise.
+ * kern/sched_prim.c (do_runq_scan): Likewise.
+ * linux/pcmcia-cs/clients/smc91c92_cs.c (smc_start_xmit): Likewise.
+ * linux/src/drivers/net/sundance.c (start_tx): Likewise.
+ * vm/vm_fault.c (vm_fault_page): Likewise.
+ * vm/vm_map.c (vm_map_pmap_enter): Likewise.
+ * vm/vm_object.c (vm_object_collapse): Likewise.
+
2008-07-04 Samuel Thibault <samuel.thibault@ens-lyon.org>
diff --git a/device/dev_pager.c b/device/dev_pager.c
index 6779d8e7..68c978cd 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -340,7 +340,7 @@ kern_return_t device_pager_data_request(
#endif /* lint */
if (device_pager_debug)
- printf("(device_pager)data_request: pager=%d, offset=0x%x, length=0x%x\n",
+ printf("(device_pager)data_request: pager=%p, offset=0x%x, length=0x%x\n",
pager, offset, length);
ds = dev_pager_hash_lookup((ipc_port_t)pager);
@@ -428,7 +428,7 @@ boolean_t device_pager_data_request_done(register io_req_t ior)
size_read = ior->io_count;
if (ior->io_residual) {
if (device_pager_debug)
- printf("(device_pager)data_request_done: r: 0x%x\n",ior->io_residual);
+ printf("(device_pager)data_request_done: r: 0x%lx\n",ior->io_residual);
memset((&ior->io_data[ior->io_count - ior->io_residual]), 0,
(unsigned) ior->io_residual);
}
@@ -606,7 +606,7 @@ kern_return_t device_pager_init_pager(
register dev_pager_t ds;
if (device_pager_debug)
- printf("(device_pager)init: pager=%d, request=%d, name=%d\n",
+ printf("(device_pager)init: pager=%p, request=%p, name=%p\n",
pager, pager_request, pager_name);
assert(pager_page_size == PAGE_SIZE);
diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c
index b897e631..f3e18835 100644
--- a/i386/i386/debug_i386.c
+++ b/i386/i386/debug_i386.c
@@ -29,7 +29,7 @@
void dump_ss(struct i386_saved_state *st)
{
- printf("Dump of i386_saved_state %08x:\n", st);
+ printf("Dump of i386_saved_state %p:\n", st);
printf("EAX %08x EBX %08x ECX %08x EDX %08x\n",
st->eax, st->ebx, st->ecx, st->edx);
printf("ESI %08x EDI %08x EBP %08x ESP %08x\n",
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index ebb327ca..faee2186 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -374,7 +374,7 @@ int user_trap(regs)
extern vm_offset_t phys_last_addr;
if ((vm_offset_t)thread < phys_last_addr) {
- printf("user_trap: bad thread pointer 0x%x\n", thread);
+ printf("user_trap: bad thread pointer 0x%p\n", thread);
printf("trap type %d, code 0x%x, va 0x%x, eip 0x%x\n",
regs->trapno, regs->err, regs->cr2, regs->eip);
asm volatile ("1: hlt; jmp 1b");
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index e0d68786..300a60be 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -676,7 +676,7 @@ comtimer()
if (++comtimer_state[i] < 2)
continue;
/* Its stuck */
-printf("Tty %x was stuck\n", tp);
+printf("Tty %p was stuck\n", tp);
nch = getc(&tp->t_outq);
outb(TXRX((int)tp->t_addr), nch);
}
diff --git a/ipc/ipc_notify.c b/ipc/ipc_notify.c
index 6a3d3818..d06346ea 100644
--- a/ipc/ipc_notify.c
+++ b/ipc/ipc_notify.c
@@ -264,7 +264,7 @@ ipc_notify_port_deleted(port, name)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped port-deleted (0x%08x, 0x%x)\n", port, name);
+ printf("dropped port-deleted (0x%p, 0x%x)\n", port, name);
ipc_port_release_sonce(port);
return;
}
@@ -298,7 +298,7 @@ ipc_notify_msg_accepted(port, name)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped msg-accepted (0x%08x, 0x%x)\n", port, name);
+ printf("dropped msg-accepted (0x%p, 0x%x)\n", port, name);
ipc_port_release_sonce(port);
return;
}
@@ -335,7 +335,7 @@ ipc_notify_port_destroyed(port, right)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped port-destroyed (0x%08x, 0x%08x)\n",
+ printf("dropped port-destroyed (0x%p, 0x%p)\n",
port, right);
ipc_port_release_sonce(port);
ipc_port_release_receive(right);
@@ -371,7 +371,7 @@ ipc_notify_no_senders(port, mscount)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped no-senders (0x%08x, %u)\n", port, mscount);
+ printf("dropped no-senders (0x%p, %u)\n", port, mscount);
ipc_port_release_sonce(port);
return;
}
@@ -404,7 +404,7 @@ ipc_notify_send_once(port)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped send-once (0x%08x)\n", port);
+ printf("dropped send-once (0x%p)\n", port);
ipc_port_release_sonce(port);
return;
}
@@ -437,7 +437,7 @@ ipc_notify_dead_name(port, name)
kmsg = ikm_alloc(sizeof *n);
if (kmsg == IKM_NULL) {
- printf("dropped dead-name (0x%08x, 0x%x)\n", port, name);
+ printf("dropped dead-name (0x%p, 0x%x)\n", port, name);
ipc_port_release_sonce(port);
return;
}
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 6d9f7852..959cc0d6 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -318,7 +318,7 @@ ipc_kobject_destroy(
default:
#if MACH_ASSERT
- printf("ipc_kobject_destroy: port 0x%x, kobj 0x%x, type %d\n",
+ printf("ipc_kobject_destroy: port 0x%p, kobj 0x%x, type %d\n",
port, port->ip_kobject, ip_kotype(port));
#endif /* MACH_ASSERT */
break;
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index ec3245d6..a3bcbf82 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -1944,7 +1944,7 @@ do_runq_scan(
stuck_threads[stuck_count++] = thread;
if (do_thread_scan_debug)
- printf("do_runq_scan: adding thread %#x\n", thread);
+ printf("do_runq_scan: adding thread %p\n", thread);
}
count--;
thread = next;
diff --git a/linux/pcmcia-cs/clients/smc91c92_cs.c b/linux/pcmcia-cs/clients/smc91c92_cs.c
index 782d504d..69215156 100644
--- a/linux/pcmcia-cs/clients/smc91c92_cs.c
+++ b/linux/pcmcia-cs/clients/smc91c92_cs.c
@@ -1472,7 +1472,7 @@ static int smc_start_xmit(struct sk_buff *skb, struct net_device *dev)
tx_timeout_check(dev, smc_tx_timeout);
skb_tx_check(dev, skb);
- DEBUG(2, "%s: smc_start_xmit(length = %d) called,"
+ DEBUG(2, "%s: smc_start_xmit(length = %ld) called,"
" status %4.4x.\n", dev->name, skb->len, inw(ioaddr + 2));
if (smc->saved_skb) {
diff --git a/linux/src/drivers/net/sundance.c b/linux/src/drivers/net/sundance.c
index cb8dfe52..47f32ebd 100644
--- a/linux/src/drivers/net/sundance.c
+++ b/linux/src/drivers/net/sundance.c
@@ -986,7 +986,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
if (np->msg_level & NETIF_MSG_TX_QUEUED) {
- printk(KERN_DEBUG "%s: Transmit frame #%d len %d queued in slot %d.\n",
+ printk(KERN_DEBUG "%s: Transmit frame #%d len %ld queued in slot %ld.\n",
dev->name, np->cur_tx, skb->len, entry);
}
return 0;
diff --git a/vm/vm_fault.c b/vm/vm_fault.c
index 540d74e7..509cb529 100644
--- a/vm/vm_fault.c
+++ b/vm/vm_fault.c
@@ -660,7 +660,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset,
m->offset + object->paging_offset,
PAGE_SIZE, access_required)) != KERN_SUCCESS) {
if (rc != MACH_SEND_INTERRUPTED)
- printf("%s(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) failed, %d\n",
+ printf("%s(0x%p, 0x%p, 0x%x, 0x%x, 0x%x) failed, %d\n",
"memory_object_data_request",
object->pager,
object->pager_request,
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 54c74701..43afe919 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -676,7 +676,7 @@ vm_map_pmap_enter(map, addr, end_addr, object, offset, protection)
if (vm_map_pmap_enter_print) {
printf("vm_map_pmap_enter:");
- printf("map: %x, addr: %x, object: %x, offset: %x\n",
+ printf("map: %p, addr: %x, object: %p, offset: %x\n",
map, addr, object, offset);
}
diff --git a/vm/vm_object.c b/vm/vm_object.c
index aac1c08d..88e94b79 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -2539,7 +2539,7 @@ void vm_object_collapse(
/* Fall through to... */
default:
- printf("vm_object_collapse: %#x (pager %#x, request %#x) up to %#x\n",
+ printf("vm_object_collapse: %p (pager %p, request %p) up to %p\n",
backing_object, backing_object->pager, backing_object->pager_request,
object);
if (vm_object_collapse_debug > 2)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-23 07:40:22 +0000