summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/vax/include/param.h3
-rw-r--r--sys/arch/vax/vax/bus_dma.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 3b380234330..3b0d43abdf7 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.28 2005/04/19 15:29:48 mickey Exp $ */
+/* $OpenBSD: param.h,v 1.29 2005/11/08 15:05:56 martin Exp $ */
/* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -131,7 +131,6 @@
/* clicks to bytes */
#define ctob(x) ((x) << PGSHIFT)
#define btoc(x) (((unsigned)(x) + PGOFSET) >> PGSHIFT)
-#define btop(x) (((unsigned)(x)) >> PGSHIFT)
/* bytes to disk blocks */
#define btodb(x) ((x) >> DEV_BSHIFT)
diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c
index e42acf8da04..2f2514b5523 100644
--- a/sys/arch/vax/vax/bus_dma.c
+++ b/sys/arch/vax/vax/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.15 2005/11/06 22:21:33 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.16 2005/11/08 15:05:56 martin Exp $ */
/* $NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $ */
/*-
@@ -533,7 +533,7 @@ _bus_dmamem_mmap(t, segs, nsegs, off, prot, flags)
continue;
}
- return (btop((u_long)segs[i].ds_addr + off));
+ return (atop(segs[i].ds_addr + off));
}
/* Page not found. */