Page MenuHomeFreeBSD
Files F112056025

D26319.diff
No OneTemporary
Actions

D26319.diff
View Options

Index: head/sys/dev/xilinx/axidma.c
===================================================================
--- head/sys/dev/xilinx/axidma.c
+++ head/sys/dev/xilinx/axidma.c
@@ -363,7 +363,7 @@
chan->mem_vaddr = kva_alloc(chan->mem_size);
pmap_kenter_device(chan->mem_vaddr, chan->mem_size, chan->mem_paddr);
- device_printf(sc->dev, "Allocated chunk %lx %d\n",
+ device_printf(sc->dev, "Allocated chunk %lx %lu\n",
chan->mem_paddr, chan->mem_size);
for (i = 0; i < nsegments; i++) {
Index: head/sys/riscv/riscv/db_disasm.c
===================================================================
--- head/sys/riscv/riscv/db_disasm.c
+++ head/sys/riscv/riscv/db_disasm.c
@@ -416,7 +416,7 @@
imm |= ((insn >> 12) & 0x1) << 5;
if (imm & (1 << 5))
imm |= (0x7ffffff << 5); /* sign ext */
- db_printf("0x%lx", imm);
+ db_printf("0x%x", imm);
break;
case 'o':
imm = ((insn >> 2) & 0x1f) << 0;
@@ -524,7 +524,7 @@
imm = (insn >> 12) & 0xfffff;
if (imm & (1 << 20))
imm |= (0xfff << 20); /* sign extend */
- db_printf("0x%lx", imm);
+ db_printf("0x%x", imm);
break;
case 'j':
/* imm[11:0] << 20 */
Index: head/sys/riscv/riscv/intr_machdep.c
===================================================================
--- head/sys/riscv/riscv/intr_machdep.c
+++ head/sys/riscv/riscv/intr_machdep.c
@@ -73,9 +73,9 @@
static void
riscv_mask_irq(void *source)
{
- uintptr_t irq;
+ int irq;
- irq = (uintptr_t)source;
+ irq = (int)(uintptr_t)source;
switch (irq) {
case IRQ_TIMER_SUPERVISOR:
@@ -95,9 +95,9 @@
static void
riscv_unmask_irq(void *source)
{
- uintptr_t irq;
+ int irq;
- irq = (uintptr_t)source;
+ irq = (int)(uintptr_t)source;
switch (irq) {
case IRQ_TIMER_SUPERVISOR:
Index: head/sys/riscv/riscv/pmap.c
===================================================================
--- head/sys/riscv/riscv/pmap.c
+++ head/sys/riscv/riscv/pmap.c
@@ -590,7 +590,7 @@
if (physmap[i + 1] > max_pa)
max_pa = physmap[i + 1];
}
- printf("physmap_idx %lx\n", physmap_idx);
+ printf("physmap_idx %u\n", physmap_idx);
printf("min_pa %lx\n", min_pa);
printf("max_pa %lx\n", max_pa);
Index: head/sys/riscv/riscv/sbi.c
===================================================================
--- head/sys/riscv/riscv/sbi.c
+++ head/sys/riscv/riscv/sbi.c
@@ -104,7 +104,7 @@
switch (sbi_impl_id) {
case (SBI_IMPL_ID_BBL):
- printf("SBI: Berkely Boot Loader %u\n", sbi_impl_version);
+ printf("SBI: Berkely Boot Loader %lu\n", sbi_impl_version);
break;
case (SBI_IMPL_ID_OPENSBI):
major = sbi_impl_version >> OPENSBI_VERSION_MAJOR_OFFSET;
@@ -112,7 +112,7 @@
printf("SBI: OpenSBI v%u.%u\n", major, minor);
break;
default:
- printf("SBI: Unrecognized Implementation: %u\n", sbi_impl_id);
+ printf("SBI: Unrecognized Implementation: %lu\n", sbi_impl_id);
break;
}
Index: head/sys/riscv/riscv/trap.c
===================================================================
--- head/sys/riscv/riscv/trap.c
+++ head/sys/riscv/riscv/trap.c
@@ -306,7 +306,7 @@
break;
default:
dump_regs(frame);
- panic("Unknown kernel exception %x trap value %lx\n",
+ panic("Unknown kernel exception %lx trap value %lx\n",
exception, frame->tf_stval);
}
}
@@ -375,7 +375,7 @@
break;
default:
dump_regs(frame);
- panic("Unknown userland exception %x, trap value %lx\n",
+ panic("Unknown userland exception %lx, trap value %lx\n",
exception, frame->tf_stval);
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 4:56 AM (16 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17130177
Default Alt Text
D26319.diff (3 KB)

Event Timeline