Module Name: src
Committed By: matt
Date: Sun Aug 23 06:38:08 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: types.h
src/sys/arch/mips/mips [matt-nb5-mips64]: db_disasm.c mips_machdep.c
pmap.c
src/sys/uvm [matt-nb5-mips64]: uvm_map.c uvm_unix.c
Log Message:
PRIxVADDR, PRIdVSIZE, PRIxVSIZE, or PRIxPADDR as appropriate.
Use __intXX_t or __uintXX_t as appropriate in <mips/types.h>
To generate a diff of this commit:
cvs rdiff -u -r1.43.36.3 -r1.43.36.4 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.19 -r1.19.62.1 src/sys/arch/mips/mips/db_disasm.c
cvs rdiff -u -r1.205.4.1.2.1.2.3 -r1.205.4.1.2.1.2.4 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.179.16.1 -r1.179.16.2 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.263.4.3 -r1.263.4.3.4.1 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.40 -r1.40.28.1 src/sys/uvm/uvm_unix.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/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.43.36.3 src/sys/arch/mips/include/types.h:1.43.36.4
--- src/sys/arch/mips/include/types.h:1.43.36.3 Sun Aug 23 03:38:19 2009
+++ src/sys/arch/mips/include/types.h Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.43.36.3 2009/08/23 03:38:19 matt Exp $ */
+/* $NetBSD: types.h,v 1.43.36.4 2009/08/23 06:38:07 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -47,53 +47,56 @@
* the rest of the operating system as possible.
*/
-#if defined(__mips_n32)
-typedef long long mips_reg_t;
-typedef unsigned long long mips_ureg_t;
-typedef long long mips_fpreg_t;
-#else
-#if defined(__mips_o64) || defined(__mips_o32)
-typedef int mips_fpreg_t;
-#else
-typedef long mips_fpreg_t;
-#endif
-typedef long mips_reg_t;
-typedef unsigned long mips_ureg_t;
-#endif
/* NB: This should probably be if defined(_KERNEL) */
#if defined(_NETBSD_SOURCE)
-#if defined(_MIPS_PADDR_T_64BIT) && !defined(_LP64)
-typedef unsigned long long paddr_t;
-typedef unsigned long long psize_t;
-#define PRIxPADDR "llx"
-#define PRIxPSIZE "llx"
+#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
+typedef __uint64_t paddr_t;
+typedef __uint64_t psize_t;
+#define PRIxPADDR PRIx64
+#define PRIxPSIZE PRIx64
+#define PRIdPSIZE PRId64
#else
-typedef unsigned long paddr_t;
-typedef unsigned long psize_t;
-#define PRIxPADDR "lx"
-#define PRIxPSIZE "lx"
-#endif
-typedef unsigned long vaddr_t;
-typedef unsigned long vsize_t;
-#define PRIxVADDR "lx"
-#define PRIxVSIZE "lx"
+typedef __uint32_t paddr_t;
+typedef __uint32_t psize_t;
+#define PRIxPADDR PRIx32
+#define PRIxPSIZE PRIx32
+#define PRIdPSIZE PRId32
+#endif
+typedef __uint32_t vaddr_t;
+typedef __uint32_t vsize_t;
+#define PRIxVADDR PRIx32
+#define PRIxVSIZE PRIx32
+#define PRIdVSIZE PRId32
#endif
/* Make sure this is signed; we need pointers to be sign-extended. */
-#if defined(__mips_n32)
-typedef long register32_t;
-typedef long long register_t;
-#define PRIxREGISTER32 "lx"
-#define PRIxREGISTER "llx"
+#if defined(__mips_o64) || defined(__mips_o32)
+typedef __uint32_t fpregister_t;
+typedef __uint32_t mips_fpreg_t; /* do not use */
+#else
+typedef __uint64_t fpregister_t;
+typedef __uint64_t mips_fpreg_t; /* do not use */
+#endif
+#if defined(__mips_o32)
+typedef __int32_t register_t;
+typedef __uint32_t uregister_t;
+typedef __int32_t mips_reg_t; /* do not use */
+typedef __uint32_t mips_ureg_t; /* do not use */
+#define PRIxREGISTER PRIx32
+#define PRIxUREGISTER PRIx32
#else
-#if !defined(__mips_o32)
-typedef int register32_t;
-#define PRIxREGISTER32 "x"
-#endif
-#define PRIxREGISTER "lx"
-typedef long register_t;
-#endif /* __mips_n32 */
+typedef __int64_t register_t;
+typedef __uint64_t uregister_t;
+typedef __int64_t mips_reg_t; /* do not use */
+typedef __uint64_t mips_ureg_t; /* do not use */
+typedef __int32_t register32_t;
+typedef __uint32_t uregister32_t;
+#define PRIxREGISTER32 PRIx32
+#define PRIxUREGISTER32 PRIx32
+#define PRIxREGISTER PRIx64
+#define PRIxUREGISTER PRIx64
+#endif /* __mips_o32 */
#if defined(_KERNEL)
typedef struct label_t {
Index: src/sys/arch/mips/mips/db_disasm.c
diff -u src/sys/arch/mips/mips/db_disasm.c:1.19 src/sys/arch/mips/mips/db_disasm.c:1.19.62.1
--- src/sys/arch/mips/mips/db_disasm.c:1.19 Wed Feb 28 04:21:53 2007
+++ src/sys/arch/mips/mips/db_disasm.c Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.19 2007/02/28 04:21:53 thorpej Exp $ */
+/* $NetBSD: db_disasm.c,v 1.19.62.1 2009/08/23 06:38:07 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.19 2007/02/28 04:21:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.19.62.1 2009/08/23 06:38:07 matt Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -509,8 +509,8 @@
db_printf("%s", symname);
else
db_printf("<%s+%lx>", symname, diff);
- db_printf("\t[addr:0x%08lx]", loc);
+ db_printf("\t[addr:%#"PRIxVADDR"]", loc);
} else {
- db_printf("0x%08lx", loc);
+ db_printf("%#"PRIxVADDR, loc);
}
}
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.3 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.4
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.3 Sun Aug 23 03:38:19 2009
+++ src/sys/arch/mips/mips/mips_machdep.c Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.3 2009/08/23 03:38:19 matt Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.4 2009/08/23 06:38:07 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.3 2009/08/23 03:38:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.4 2009/08/23 06:38:07 matt Exp $");
#include "opt_cputype.h"
@@ -1498,8 +1498,8 @@
/* warn if the message buffer had to be shrunk */
if (sz != reqsz)
- printf("WARNING: %ld bytes not available for msgbuf "
- "in last cluster (%ld used)\n", reqsz, sz);
+ printf("WARNING: %"PRIdVSIZE" bytes not available for msgbuf "
+ "in last cluster (%"PRIdVSIZE" used)\n", reqsz, sz);
}
void
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.1 src/sys/arch/mips/mips/pmap.c:1.179.16.2
--- src/sys/arch/mips/mips/pmap.c:1.179.16.1 Fri Aug 21 17:37:30 2009
+++ src/sys/arch/mips/mips/pmap.c Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.179.16.1 2009/08/21 17:37:30 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.179.16.2 2009/08/23 06:38:07 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.1 2009/08/21 17:37:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.2 2009/08/23 06:38:07 matt Exp $");
/*
* Manages physical address maps.
@@ -269,8 +269,8 @@
if (pg == NULL) {
/* page is unmanaged */
#ifdef DIAGNOSTIC
- printf("mips_flushcache_allpvh(): unmanged pa = %08lx\n",
- (u_long)pa);
+ printf("mips_flushcache_allpvh(): unmanaged pa = %#"PRIxPADDR"\n",
+ pa);
#endif
return;
}
@@ -743,7 +743,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT))
- printf("pmap_remove(%p, %lx, %lx)\n", pmap, sva, eva);
+ printf("pmap_remove(%p, %#"PRIxVADDR", %#"PRIxVADDR")\n", pmap, sva, eva);
remove_stats.calls++;
#endif
if (pmap == pmap_kernel()) {
@@ -851,8 +851,8 @@
#ifdef DEBUG
if ((pmapdebug & (PDB_FOLLOW|PDB_PROTECT)) ||
(prot == VM_PROT_NONE && (pmapdebug & PDB_REMOVE)))
- printf("pmap_page_protect(%lx, %x)\n",
- (u_long)VM_PAGE_TO_PHYS(pg), prot);
+ printf("pmap_page_protect(%#"PRIxPADDR", %x)\n",
+ VM_PAGE_TO_PHYS(pg), prot);
#endif
switch (prot) {
case VM_PROT_READ|VM_PROT_WRITE:
@@ -902,7 +902,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_PROTECT))
- printf("pmap_protect(%p, %lx, %lx, %x)\n",
+ printf("pmap_protect(%p, %#"PRIxVADDR", %#"PRIxVADDR", %x)\n",
pmap, sva, eva, prot);
#endif
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
@@ -1071,7 +1071,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_page_uncache(%lx)\n", (u_long)VM_PAGE_TO_PHYS(pg));
+ printf("pmap_page_uncache(%#"PRIxPADDR")\n", VM_PAGE_TO_PHYS(pg));
#endif
newmode = mode & PV_UNCACHED ? MIPS3_PG_UNCACHED : MIPS3_PG_CACHED;
pv = pg->mdpage.pvh_list;
@@ -1136,8 +1136,8 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_enter(%p, %lx, %lx, %x, %x)\n",
- pmap, va, (u_long)pa, prot, wired);
+ printf("pmap_enter(%p, %#"PRIxVADDR", %#"PRIxPADDR", %x, %x)\n",
+ pmap, va, pa, prot, wired);
#endif
#if defined(DEBUG) || defined(DIAGNOSTIC) || defined(PARANOIADIAG)
if (pmap == pmap_kernel()) {
@@ -1368,8 +1368,8 @@
if (MIPS_HAS_R4K_MMU && (prot == (VM_PROT_READ | VM_PROT_EXECUTE))) {
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("pmap_enter: flush I cache va %lx (%lx)\n",
- va - NBPG, (u_long)pa);
+ printf("pmap_enter: flush I cache va %#"PRIxVADDR" (%#"PRIxPADDR")\n",
+ va - NBPG, pa);
#endif
/* XXXJRT */
mips_icache_sync_range_index(va, PAGE_SIZE);
@@ -1388,7 +1388,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
- printf("pmap_kenter_pa(%lx, %lx, %x)\n", va, (u_long)pa, prot);
+ printf("pmap_kenter_pa(%#"PRIxVADDR", %#"PRIxPADDR", %x)\n", va, pa, prot);
#endif
if (MIPS_HAS_R4K_MMU) {
@@ -1433,7 +1433,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE))
- printf("pmap_kremove(%lx, %lx)\n", va, len);
+ printf("pmap_kremove(%#"PRIxVADDR", %#"PRIxVSIZE")\n", va, len);
#endif
pte = kvtopte(va);
@@ -1469,7 +1469,7 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_WIRING))
- printf("pmap_unwire(%p, %lx)\n", pmap, va);
+ printf("pmap_unwire(%p, %#"PRIxVADDR")\n", pmap, va);
#endif
/*
* Don't need to flush the TLB since PG_WIRED is only in software.
@@ -1485,7 +1485,7 @@
pte = pmap_segmap(pmap, va);
#ifdef DIAGNOSTIC
if (pte == NULL)
- panic("pmap_unwire: pmap %p va 0x%lx invalid STE",
+ panic("pmap_unwire: pmap %p va %#"PRIxVADDR" invalid STE",
pmap, va);
#endif
pte += (va >> PGSHIFT) & (NPTEPG - 1);
@@ -1493,7 +1493,7 @@
#ifdef DIAGNOSTIC
if (mips_pg_v(pte->pt_entry) == 0)
- panic("pmap_unwire: pmap %p va 0x%lx invalid PTE",
+ panic("pmap_unwire: pmap %p va %#"PRIxVADDR" invalid PTE",
pmap, va);
#endif
@@ -1503,7 +1503,7 @@
}
#ifdef DIAGNOSTIC
else {
- printf("pmap_unwire: wiring for pmap %p va 0x%lx "
+ printf("pmap_unwire: wiring for pmap %p va %#"PRIxVADDR" "
"didn't change!\n", pmap, va);
}
#endif
@@ -1523,7 +1523,7 @@
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_extract(%p, 0x%lx) -> ", pmap, va);
+ printf("pmap_extract(%p, %#"PRIxVADDR") -> ", pmap, va);
#endif
if (pmap == pmap_kernel()) {
if (va >= (uintptr_t)MIPS_KSEG0_START && va < (uintptr_t)MIPS_KSEG1_START) {
@@ -1538,7 +1538,7 @@
#endif
#ifdef DIAGNOSTIC
else if (va >= (uintptr_t)MIPS_KSEG1_START && va < (uintptr_t)MIPS_KSEG2_START)
- panic("pmap_extract: kseg1 address 0x%lx", va);
+ panic("pmap_extract: kseg1 address %#"PRIxVADDR"", va);
#endif
else
pte = kvtopte(va);
@@ -1566,7 +1566,7 @@
}
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pa 0x%lx\n", (u_long)pa);
+ printf("pa %#"PRIxPADDR"\n", pa);
#endif
return true;
}
@@ -1585,7 +1585,7 @@
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy(%p, %p, %lx, %lx, %lx)\n",
+ printf("pmap_copy(%p, %p, %#"PRIxVADDR", %#"PRIxVSIZE", %#"PRIxVADDR")\n",
dst_pmap, src_pmap, dst_addr, len, src_addr);
#endif
}
@@ -1625,11 +1625,11 @@
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_zero_page(%lx)\n", (u_long)phys);
+ printf("pmap_zero_page(%#"PRIxPADDR")\n", phys);
#endif
#ifdef PARANOIADIAG
if (!(phys < MIPS_MAX_MEM_ADDR))
- printf("pmap_zero_page(%lx) nonphys\n", (u_long)phys);
+ printf("pmap_zero_page(%#"PRIxPADDR") nonphys\n", phys);
#endif
va = MIPS_PHYS_TO_KSEG0(phys);
@@ -1668,13 +1668,13 @@
{
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy_page(%lx, %lx)\n", (u_long)src, (u_long)dst);
+ printf("pmap_copy_page(%#"PRIxPADDR", %#"PRIxPADDR")\n", src, dst);
#endif
#ifdef PARANOIADIAG
if (!(src < MIPS_MAX_MEM_ADDR))
- printf("pmap_copy_page(%lx) src nonphys\n", (u_long)src);
+ printf("pmap_copy_page(%#"PRIxPADDR") src nonphys\n", src);
if (!(dst < MIPS_MAX_MEM_ADDR))
- printf("pmap_copy_page(%lx) dst nonphys\n", (u_long)dst);
+ printf("pmap_copy_page(%#"PRIxPADDR") dst nonphys\n", dst);
#endif
#if defined(MIPS3_PLUS) /* XXX mmu XXX */
@@ -1735,8 +1735,8 @@
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_reference(%lx)\n",
- (u_long)VM_PAGE_TO_PHYS(pg));
+ printf("pmap_clear_reference(%#"PRIxPADDR")\n",
+ VM_PAGE_TO_PHYS(pg));
#endif
attrp = &pg->mdpage.pvh_attrs;
rv = *attrp & PV_REFERENCED;
@@ -1773,7 +1773,7 @@
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
- printf("pmap_clear_modify(%lx)\n", (u_long)VM_PAGE_TO_PHYS(pg));
+ printf("pmap_clear_modify(%#"PRIxPADDR")\n", VM_PAGE_TO_PHYS(pg));
#endif
attrp = &pg->mdpage.pvh_attrs;
rv = *attrp & PV_MODIFIED;
@@ -1901,7 +1901,7 @@
pv = pg->mdpage.pvh_list;
#ifdef DEBUG
if (pmapdebug & PDB_ENTER)
- printf("pmap_enter: pv %p: was %lx/%p/%p\n",
+ printf("pmap_enter: pv %p: was %#"PRIxVADDR"/%p/%p\n",
pv, pv->pv_va, pv->pv_pmap, pv->pv_next);
#endif
#if defined(MIPS3_NO_PV_UNCACHED)
@@ -1915,7 +1915,7 @@
#ifdef DEBUG
if (pmapdebug & PDB_PVENTRY)
- printf("pmap_enter: first pv: pmap %p va %lx\n",
+ printf("pmap_enter: first pv: pmap %p va %#"PRIxVADDR"\n",
pmap, va);
enter_stats.firstpv++;
#endif
@@ -2011,8 +2011,8 @@
mips_tlbpfn_to_paddr(entry) !=
VM_PAGE_TO_PHYS(pg))
printf(
- "pmap_enter: found va %lx pa %lx in pv_table but != %x\n",
- va, (u_long)VM_PAGE_TO_PHYS(pg),
+ "pmap_enter: found va %#"PRIxVADDR" pa %#"PRIxPADDR" in pv_table but != %x\n",
+ va, VM_PAGE_TO_PHYS(pg),
entry);
#endif
return;
@@ -2020,7 +2020,7 @@
}
#ifdef DEBUG
if (pmapdebug & PDB_PVENTRY)
- printf("pmap_enter: new pv: pmap %p va %lx\n",
+ printf("pmap_enter: new pv: pmap %p va %#"PRIxVADDR"\n",
pmap, va);
#endif
npv = (pv_entry_t)pmap_pv_alloc();
@@ -2053,8 +2053,8 @@
#ifdef DEBUG
if (pmapdebug & (PDB_FOLLOW|PDB_PVENTRY))
- printf("pmap_remove_pv(%p, %lx, %lx)\n", pmap, va,
- (u_long)VM_PAGE_TO_PHYS(pg));
+ printf("pmap_remove_pv(%p, %#"PRIxVADDR", %#"PRIxPADDR")\n", pmap, va,
+ VM_PAGE_TO_PHYS(pg));
#endif
pv = pg->mdpage.pvh_list;
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.263.4.3 src/sys/uvm/uvm_map.c:1.263.4.3.4.1
--- src/sys/uvm/uvm_map.c:1.263.4.3 Sun Apr 19 15:43:14 2009
+++ src/sys/uvm/uvm_map.c Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.263.4.3 2009/04/19 15:43:14 snj Exp $ */
+/* $NetBSD: uvm_map.c,v 1.263.4.3.4.1 2009/08/23 06:38:07 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.263.4.3 2009/04/19 15:43:14 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.263.4.3.4.1 2009/08/23 06:38:07 matt Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -100,6 +100,16 @@
#include <uvm/uvm_ddb.h>
#endif
+#ifndef PRIxPADDR
+#define PRIxPADDR "%lx"
+#endif
+#ifndef PRIxVADDR
+#define PRIxVADDR "%lx"
+#endif
+#ifndef PRIxVSIZE
+#define PRIxVSIZE "%lx"
+#endif
+
#if !defined(UVMMAP_COUNTERS)
#define UVMMAP_EVCNT_DEFINE(name) /* nothing */
@@ -567,7 +577,7 @@
goto error;
}
if (trtmp != NULL && trtmp->start >= tmp->start) {
- printf("corrupt: 0x%lx >= 0x%lx\n",
+ printf("corrupt: %#"PRIxVADDR" >= %#"PRIxVADDR"\n",
trtmp->start, tmp->start);
goto error;
}
@@ -2593,7 +2603,7 @@
if (tmpent->start < cur)
panic("uvm_map_replace1");
if (tmpent->start > tmpent->end || tmpent->end > end) {
- printf("tmpent->start=0x%lx, tmpent->end=0x%lx, end=0x%lx\n",
+ printf("tmpent->start=%#"PRIxVADDR", tmpent->end=%#"PRIxVADDR", end=%#"PRIxVADDR"\n",
tmpent->start, tmpent->end, end);
panic("uvm_map_replace2");
}
Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.40 src/sys/uvm/uvm_unix.c:1.40.28.1
--- src/sys/uvm/uvm_unix.c:1.40 Wed Jan 2 11:49:21 2008
+++ src/sys/uvm/uvm_unix.c Sun Aug 23 06:38:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_unix.c,v 1.40 2008/01/02 11:49:21 ad Exp $ */
+/* $NetBSD: uvm_unix.c,v 1.40.28.1 2009/08/23 06:38:07 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.40 2008/01/02 11:49:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.40.28.1 2009/08/23 06:38:07 matt Exp $");
#include "opt_pax.h"
@@ -117,7 +117,10 @@
UVM_ADV_NORMAL, UVM_FLAG_AMAPPAD|UVM_FLAG_FIXED|
UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW));
if (error) {
- uprintf("sbrk: grow %ld failed, error = %d\n",
+#ifndef PRIdVSIZE
+#define PRIdVSIZE "%ld"
+#endif
+ uprintf("sbrk: grow %"PRIdVSIZE" failed, error = %d\n",
new - old, error);
mutex_exit(&p->p_auxlock);
return (error);
