diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2007-09-15 10:10:38 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2007-09-15 10:10:38 +0000 |
| commit | 0162dc0b99f1ddd418a8bc34a022ebe3c8803693 (patch) | |
| tree | 252837b34b0283ad1a28c757b22cfde02a4f8a9e /sys/dev | |
| parent | 5ddcba9d2355ab2d50df6f406683bf464fafc2cc (diff) | |
replace ctob and btoc with ptoa and atop respectively
help and ok miod@ thib@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index f697ba71116..4c68e918460 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.h,v 1.18 2007/05/02 02:20:37 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.h,v 1.19 2007/09/15 10:10:37 martin Exp $ */ /* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -122,7 +122,7 @@ typedef struct pci_attach_args * ahc_dev_softc_t; * multiple of 16 which should align us on even the largest of cacheline * boundaries. */ -#define AHC_NSEG (roundup(btoc(MAXPHYS) + 1, 16)) +#define AHC_NSEG (roundup(atop(MAXPHYS) + 1, 16)) /* This driver supports target mode */ //#define AHC_TARGET_MODE 1 diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 3ffed6e1394..138414d5a5e 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.24 2007/07/25 23:11:52 art Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.25 2007/09/15 10:10:37 martin Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -1554,7 +1554,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro /* meteor_mem structure for SYNC Capture */ if (geo->frames > 1) temp += PAGE_SIZE; - temp = btoc(temp); + temp = atop(round_page(temp)); if ((int) temp > bktr->alloc_pages && bktr->video.addr == 0) { |