Module Name: src
Committed By: nakayama
Date: Sat May 21 16:32:01 UTC 2011
Modified Files:
src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c ofdev.c
Log Message:
Fix debug build.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc/stand/ofwboot/ofdev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c
diff -u src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.9 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.10
--- src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.9 Sat May 21 15:50:42 2011
+++ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c Sat May 21 16:32:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.c,v 1.9 2011/05/21 15:50:42 tsutsui Exp $ */
+/* $NetBSD: loadfile_machdep.c,v 1.10 2011/05/21 16:32:00 nakayama Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -251,7 +251,8 @@
if (itlb_slot >= itlb_slot_max)
panic("mmu_mapin: out of itlb_slots");
- DPRINTF(("mmu_mapin: %p:%p.%p\n", va, hi(pa), lo(pa)));
+ DPRINTF(("mmu_mapin: 0x%lx:0x%x.0x%x\n", va,
+ hi(pa), lo(pa)));
data = TSB_DATA(0, /* global */
PGSZ_4M, /* 4mb page */
Index: src/sys/arch/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.30 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.31
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.30 Sat May 21 15:50:42 2011
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Sat May 21 16:32:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.30 2011/05/21 15:50:42 tsutsui Exp $ */
+/* $NetBSD: ofdev.c,v 1.31 2011/05/21 16:32:00 nakayama Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -126,7 +126,7 @@
sizeof devtype) < 0)
devtype[0] = 0;
}
- DPRINTF(("filename: not found\n",lp));
+ DPRINTF(("filename: not found\n"));
return 0;
}
@@ -501,12 +501,12 @@
} else {
part = partition ? partition - 'a' : 0;
ofdev.partoff = label.d_partitions[part].p_offset;
- DPRINTF(("devopen: setting partition %d offset %x\n",
+ DPRINTF(("devopen: setting partition %d offset %lx\n",
part, ofdev.partoff));
if (label.d_partitions[part].p_fstype == FS_RAID) {
ofdev.partoff += RF_PROTECTED_SECTORS;
DPRINTF(("devopen: found RAID partition, "
- "adjusting offset to %x\n", ofdev.partoff));
+ "adjusting offset to %lx\n", ofdev.partoff));
}
}
