Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation problems in DEBUG code.

Browse Source
This commit is contained in:
eeh 2002-06-24 18:48:13 +00:00
parent 2e935ec638
commit 691c4d1179
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sparc64/dev/iommu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iommu.c,v 1.55 2002/06/20 18:26:23 eeh Exp $ */ /* $NetBSD: iommu.c,v 1.56 2002/06/24 18:48:13 eeh Exp $ */
/* /*
* Copyright (c) 2001, 2002 Eduardo Horvath * Copyright (c) 2001, 2002 Eduardo Horvath
@ -921,7 +921,7 @@ iommu_dvmamap_sync(t, sb, map, offset, len, ops)
"BUS_DMASYNC_POSTREAD\n", (void *)(u_long)va, (u_long)len)); "BUS_DMASYNC_POSTREAD\n", (void *)(u_long)va, (u_long)len));
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (va < is->is_dvmabase || va >= is->is_dvmaend) if (va < is->is_dvmabase || va >= is->is_dvmaend)
panic("iommu_dvmamap_sync: invalid dva %p", va); panic("iommu_dvmamap_sync: invalid dva %lx", va);
#endif #endif
tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)]; tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)];
@ -948,7 +948,7 @@ iommu_dvmamap_sync(t, sb, map, offset, len, ops)
if (ops & BUS_DMASYNC_PREWRITE) { if (ops & BUS_DMASYNC_PREWRITE) {
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (va < is->is_dvmabase || va >= is->is_dvmaend) if (va < is->is_dvmabase || va >= is->is_dvmaend)
panic("iommu_dvmamap_sync: invalid dva %p", va); panic("iommu_dvmamap_sync: invalid dva %lx", va);
#endif #endif
tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)]; tte = is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)];

4
sys/arch/sparc64/sparc64/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.123 2002/06/21 02:57:29 eeh Exp $ */ /* $NetBSD: pmap.c,v 1.124 2002/06/24 18:48:15 eeh Exp $ */
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF #define HWREF
/* /*
@ -2520,7 +2520,7 @@ pmap_extract(pm, va, pap)
pa = (pseg_get(pm, va)&TLB_PA_MASK)+(va&PGOFSET); pa = (pseg_get(pm, va)&TLB_PA_MASK)+(va&PGOFSET);
#ifdef DEBUG #ifdef DEBUG
if (pmapdebug & PDB_EXTRACT) { if (pmapdebug & PDB_EXTRACT) {
npa = ldxa((vaddr_t)&pm->pm_segs[va_to_seg(va)], ASI_PHYS_CACHED); paddr_t npa = ldxa((vaddr_t)&pm->pm_segs[va_to_seg(va)], ASI_PHYS_CACHED);
printf("pmap_extract: va=%p segs[%ld]=%llx", (void *)(u_long)va, (long)va_to_seg(va), (unsigned long long)npa); printf("pmap_extract: va=%p segs[%ld]=%llx", (void *)(u_long)va, (long)va_to_seg(va), (unsigned long long)npa);
if (npa) { if (npa) {
npa = (paddr_t)ldxa((vaddr_t)&((paddr_t*)(u_long)npa)[va_to_dir(va)], ASI_PHYS_CACHED); npa = (paddr_t)ldxa((vaddr_t)&((paddr_t*)(u_long)npa)[va_to_dir(va)], ASI_PHYS_CACHED);