diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-11-23 11:30:15 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-11-23 11:30:15 +0000 |
| commit | fcf813dc561c01ef35828627afde907ab2be6db6 (patch) | |
| tree | 6260a8289487ebc356bfe3642a807f187b76b0f3 /sys/dev/ic | |
| parent | dcb769a84f5ac99a41089b979c808541d2fbc842 (diff) | |
assume vtophys(vaddr_t) just what all the other archs expect; no functional change
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/pdqvar.h | 6 | ||||
| -rw-r--r-- | sys/dev/ic/uha.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h index 4d39a944477..d4e1644cf96 100644 --- a/sys/dev/ic/pdqvar.h +++ b/sys/dev/ic/pdqvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pdqvar.h,v 1.16 2002/06/09 03:14:18 todd Exp $ */ +/* $OpenBSD: pdqvar.h,v 1.17 2005/11/23 11:30:14 mickey Exp $ */ /* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */ /*- @@ -84,9 +84,9 @@ enum _pdq_type_t { #define PDQ_OS_USEC_DELAY(n) DELAY(n) #define PDQ_OS_MEMZERO(p, n) bzero((caddr_t)(p), (n)) #if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__alpha__) -#define PDQ_OS_VA_TO_PA(pdq, p) (alpha_XXX_dmamap((vm_offset_t)p)) +#define PDQ_OS_VA_TO_PA(pdq, p) (alpha_XXX_dmamap((vaddr_t)p)) #else -#define PDQ_OS_VA_TO_PA(pdq, p) vtophys(p) +#define PDQ_OS_VA_TO_PA(pdq, p) vtophys((vaddr_t)p) #endif #define PDQ_OS_MEMALLOC(n) malloc(n, M_DEVBUF, M_NOWAIT) #define PDQ_OS_MEMFREE(p, n) free((void *) p, M_DEVBUF) diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c index fd9ac7bb1df..a93f43faa9c 100644 --- a/sys/dev/ic/uha.c +++ b/sys/dev/ic/uha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha.c,v 1.6 2005/02/17 18:07:36 jfb Exp $ */ +/* $OpenBSD: uha.c,v 1.7 2005/11/23 11:30:14 mickey Exp $ */ /* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */ #undef UHADEBUG @@ -84,7 +84,7 @@ #define Debugger() panic("should call debugger here (ultra14f.c)") #endif /* ! DDB */ -#define KVTOPHYS(x) vtophys(x) +#define KVTOPHYS(x) vtophys((vaddr_t)x) integrate void uha_reset_mscp(struct uha_softc *, struct uha_mscp *); void uha_free_mscp(struct uha_softc *, struct uha_mscp *); |