summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/arm/arm32_machdep.c6
-rw-r--r--sys/arch/arm/arm/db_machdep.c14
-rw-r--r--sys/arch/arm/arm/disassem.c4
-rw-r--r--sys/arch/arm/arm/fault.c22
-rw-r--r--sys/arch/arm/arm/pmap7.c6
-rw-r--r--sys/arch/arm/xscale/pxa2x0_gpio.c4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_intr.c4
7 files changed, 30 insertions, 30 deletions
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index f5f398e3571..88f96c204f8 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm32_machdep.c,v 1.42 2014/04/03 10:17:34 mpi Exp $ */
+/* $OpenBSD: arm32_machdep.c,v 1.43 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */
/*
@@ -278,7 +278,7 @@ cpu_startup()
*/
printf(version);
- printf("real mem = %u (%uMB)\n", ptoa(physmem),
+ printf("real mem = %lu (%luMB)\n", ptoa(physmem),
ptoa(physmem)/1024/1024);
/*
@@ -300,7 +300,7 @@ cpu_startup()
*/
bufinit();
- printf("avail mem = %lu (%uMB)\n", ptoa(uvmexp.free),
+ printf("avail mem = %lu (%luMB)\n", ptoa(uvmexp.free),
ptoa(uvmexp.free)/1024/1024);
curpcb = &proc0.p_addr->u_pcb;
diff --git a/sys/arch/arm/arm/db_machdep.c b/sys/arch/arm/arm/db_machdep.c
index 0f16265b598..3305b04af6b 100644
--- a/sys/arch/arm/arm/db_machdep.c
+++ b/sys/arch/arm/arm/db_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.c,v 1.4 2013/05/10 22:06:10 patrick Exp $ */
+/* $OpenBSD: db_machdep.c,v 1.5 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: db_machdep.c,v 1.8 2003/07/15 00:24:41 lukem Exp $ */
/*
@@ -53,14 +53,14 @@ db_show_frame_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif)
frame = (struct trapframe *)addr;
db_printf("frame address = %08x ", (u_int)frame);
- db_printf("spsr=%08x\n", frame->tf_spsr);
- db_printf("r0 =%08x r1 =%08x r2 =%08x r3 =%08x\n",
+ db_printf("spsr=%08lx\n", frame->tf_spsr);
+ db_printf("r0 =%08lx r1 =%08lx r2 =%08lx r3 =%08lx\n",
frame->tf_r0, frame->tf_r1, frame->tf_r2, frame->tf_r3);
- db_printf("r4 =%08x r5 =%08x r6 =%08x r7 =%08x\n",
+ db_printf("r4 =%08lx r5 =%08lx r6 =%08lx r7 =%08lx\n",
frame->tf_r4, frame->tf_r5, frame->tf_r6, frame->tf_r7);
- db_printf("r8 =%08x r9 =%08x r10=%08x r11=%08x\n",
+ db_printf("r8 =%08lx r9 =%08lx r10=%08lx r11=%08lx\n",
frame->tf_r8, frame->tf_r9, frame->tf_r10, frame->tf_r11);
- db_printf("r12=%08x r13=%08x r14=%08x r15=%08x\n",
+ db_printf("r12=%08lx r13=%08lx r14=%08lx r15=%08lx\n",
frame->tf_r12, frame->tf_usr_sp, frame->tf_usr_lr, frame->tf_pc);
- db_printf("slr=%08x\n", frame->tf_svc_lr);
+ db_printf("slr=%08lx\n", frame->tf_svc_lr);
}
diff --git a/sys/arch/arm/arm/disassem.c b/sys/arch/arm/arm/disassem.c
index a73db557e09..a33101c7486 100644
--- a/sys/arch/arm/arm/disassem.c
+++ b/sys/arch/arm/arm/disassem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disassem.c,v 1.2 2011/11/10 17:46:18 miod Exp $ */
+/* $OpenBSD: disassem.c,v 1.3 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: disassem.c,v 1.14 2003/03/27 16:58:36 mycroft Exp $ */
/*
@@ -674,7 +674,7 @@ disassemble_readword(db_expr_t address)
static void
disassemble_printaddr(db_expr_t address)
{
- db_printf("0x%08x", address);
+ db_printf("0x%08lx", address);
}
static const disasm_interface_t disassemble_di = {
diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c
index 79d0d463c87..c3802ec5cf1 100644
--- a/sys/arch/arm/arm/fault.c
+++ b/sys/arch/arm/arm/fault.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fault.c,v 1.16 2014/04/18 11:51:16 guenther Exp $ */
+/* $OpenBSD: fault.c,v 1.17 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $ */
/*
@@ -471,29 +471,29 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_int far, struct proc *p,
if ((fsr & FAULT_IMPRECISE) != 0)
printf(" (imprecise)");
#endif
- printf(", spsr=%08x\n", tf->tf_spsr);
+ printf(", spsr=%08lx\n", tf->tf_spsr);
} else {
- printf("Fatal %s mode prefetch abort at 0x%08x\n",
+ printf("Fatal %s mode prefetch abort at 0x%08lx\n",
mode, tf->tf_pc);
- printf("trapframe: %p\nIFSR=%08x, IFAR=%08x, spsr=%08x\n",
+ printf("trapframe: %p\nIFSR=%08x, IFAR=%08x, spsr=%08lx\n",
tf, fsr, far, tf->tf_spsr);
}
- printf("r0 =%08x, r1 =%08x, r2 =%08x, r3 =%08x\n",
+ printf("r0 =%08lx, r1 =%08lx, r2 =%08lx, r3 =%08lx\n",
tf->tf_r0, tf->tf_r1, tf->tf_r2, tf->tf_r3);
- printf("r4 =%08x, r5 =%08x, r6 =%08x, r7 =%08x\n",
+ printf("r4 =%08lx, r5 =%08lx, r6 =%08lx, r7 =%08lx\n",
tf->tf_r4, tf->tf_r5, tf->tf_r6, tf->tf_r7);
- printf("r8 =%08x, r9 =%08x, r10=%08x, r11=%08x\n",
+ printf("r8 =%08lx, r9 =%08lx, r10=%08lx, r11=%08lx\n",
tf->tf_r8, tf->tf_r9, tf->tf_r10, tf->tf_r11);
- printf("r12=%08x, ", tf->tf_r12);
+ printf("r12=%08lx, ", tf->tf_r12);
if (TRAP_USERMODE(tf))
- printf("usp=%08x, ulr=%08x",
+ printf("usp=%08lx, ulr=%08lx",
tf->tf_usr_sp, tf->tf_usr_lr);
else
- printf("ssp=%08x, slr=%08x",
+ printf("ssp=%08lx, slr=%08lx",
tf->tf_svc_sp, tf->tf_svc_lr);
- printf(", pc =%08x\n\n", tf->tf_pc);
+ printf(", pc =%08lx\n\n", tf->tf_pc);
#if defined(DDB) || defined(KGDB)
kdb_trap(T_FAULT, tf);
diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index 14a4c3aae31..bd973160779 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap7.c,v 1.13 2014/03/29 18:09:28 guenther Exp $ */
+/* $OpenBSD: pmap7.c,v 1.14 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */
/*
@@ -2049,7 +2049,7 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va, vm_prot_t ftype, int user)
pa = l2pte_pa(pte);
if ((ftype & VM_PROT_EXECUTE) && (pte & L2_V7_S_XN)) {
-printf("%s: va %08x ftype %x %c pte %08x\n", __func__, va, ftype, user ? 'u' : 's', pte);
+printf("%s: va %08lx ftype %x %c pte %08x\n", __func__, va, ftype, user ? 'u' : 's', pte);
printf("fault on exec\n");
Debugger();
/* XXX FIX THIS */
@@ -2130,7 +2130,7 @@ Debugger();
PTE_SYNC(ptep);
rv = 1;
} else {
-printf("%s: va %08x ftype %x %c pte %08x\n", __func__, va, ftype, user ? 'u' : 's', pte);
+printf("%s: va %08lx ftype %x %c pte %08x\n", __func__, va, ftype, user ? 'u' : 's', pte);
goto out;
}
diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.c b/sys/arch/arm/xscale/pxa2x0_gpio.c
index 9d94b3d4273..23b77322da4 100644
--- a/sys/arch/arm/xscale/pxa2x0_gpio.c
+++ b/sys/arch/arm/xscale/pxa2x0_gpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_gpio.c,v 1.22 2010/09/20 06:33:47 matthew Exp $ */
+/* $OpenBSD: pxa2x0_gpio.c,v 1.23 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: pxa2x0_gpio.c,v 1.2 2003/07/15 00:24:55 lukem Exp $ */
/*
@@ -399,7 +399,7 @@ pxa2x0_gpio_intr_string(void *cookie)
if (gh == NULL)
snprintf(irqstr, sizeof irqstr, "couldn't establish interrupt");
else
- snprintf(irqstr, sizeof irqstr, "irq %ld", gh->gh_irq);
+ snprintf(irqstr, sizeof irqstr, "irq %d", gh->gh_irq);
return(irqstr);
}
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c
index d1b0798cb9f..633436b4c36 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.c
+++ b/sys/arch/arm/xscale/pxa2x0_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_intr.c,v 1.24 2014/03/29 18:09:28 guenther Exp $ */
+/* $OpenBSD: pxa2x0_intr.c,v 1.25 2014/05/08 21:17:00 miod Exp $ */
/* $NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $ */
/*
@@ -706,7 +706,7 @@ pxa2x0_intr_string(void *cookie)
if (ih == NULL)
snprintf(irqstr, sizeof irqstr, "couldn't establish interrupt");
else
- snprintf(irqstr, sizeof irqstr, "irq %ld", ih->ih_irq);
+ snprintf(irqstr, sizeof irqstr, "irq %d", ih->ih_irq);
return irqstr;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 09:13:29 +0000