diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2007-12-31 09:23:55 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2007-12-31 09:23:55 +0000 |
| commit | e1ce8a29bd40d25eacf813c6e404f6c93aeca229 (patch) | |
| tree | 6e545dc0e2e247dc1dcb11f38e31aab7b65f840a /sys/arch/m88k | |
| parent | b1a9105da952d5a2d6c3c3413d20c6761117784f (diff) | |
replace ctob/btoc by ptoa/atop as done for other architectures
Diffstat (limited to 'sys/arch/m88k')
| -rw-r--r-- | sys/arch/m88k/include/param.h | 6 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/sig_machdep.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h index f643deefa85..690629eb66c 100644 --- a/sys/arch/m88k/include/param.h +++ b/sys/arch/m88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.11 2007/12/05 22:12:32 miod Exp $ */ +/* $OpenBSD: param.h,v 1.12 2007/12/31 09:23:53 martin Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -99,10 +99,6 @@ #define ctod(x) ((x) << (PGSHIFT - DEV_BSHIFT)) #define dtoc(x) ((x) >> (PGSHIFT - DEV_BSHIFT)) -/* pages to bytes */ -#define ctob(x) ((x) << PGSHIFT) -#define btoc(x) (((x) + PGOFSET) >> PGSHIFT) - /* bytes to disk blocks */ #define btodb(x) ((x) >> DEV_BSHIFT) #define dbtob(x) ((x) << DEV_BSHIFT) diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 1eeb3d29467..63d655e7500 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.42 2007/12/20 21:15:51 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.43 2007/12/31 09:23:53 martin Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -704,7 +704,7 @@ pmap_bootstrap(vaddr_t load_start) SYSMAP(caddr_t, vmpte, vmmap, 1); invalidate_pte(vmpte); - SYSMAP(struct msgbuf *, msgbufmap, msgbufp, btoc(MSGBUFSIZE)); + SYSMAP(struct msgbuf *, msgbufmap, msgbufp, atop(MSGBUFSIZE)); virtual_avail = virt; diff --git a/sys/arch/m88k/m88k/sig_machdep.c b/sys/arch/m88k/m88k/sig_machdep.c index 1478743b52c..703c0e6cb07 100644 --- a/sys/arch/m88k/m88k/sig_machdep.c +++ b/sys/arch/m88k/m88k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.7 2007/12/08 18:38:23 miod Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.8 2007/12/31 09:23:53 martin Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -118,7 +118,7 @@ sendsig(sig_t catcher, int sig, int mask, unsigned long code, int type, if (((vaddr_t)fp & 0x07) != 0) fp = (struct sigframe *)((vaddr_t)fp & ~0x07); - if ((vaddr_t)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) + if ((vaddr_t)fp <= USRSTACK - ptoa(p->p_vmspace->vm_ssize)) (void)uvm_grow(p, (vaddr_t)fp); #ifdef DEBUG |