diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2008-05-03 20:18:25 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2008-05-03 20:18:25 +0000 |
| commit | bf943fdcdd10e19d91d5d9f03db2a1e558ea85b6 (patch) | |
| tree | 0817027c687b851e7ef4979874087445ace986e0 /sys/arch | |
| parent | cdacab32d8440eb8b190c79d74fb42bd48526e74 (diff) | |
catch up with curpriority changes and convert to ptoa/atop
ok miod@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/solbourne/include/param.h | 6 | ||||
| -rw-r--r-- | sys/arch/solbourne/solbourne/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/solbourne/solbourne/trap.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/solbourne/include/param.h b/sys/arch/solbourne/include/param.h index 9c535c0c718..e51952a19fc 100644 --- a/sys/arch/solbourne/include/param.h +++ b/sys/arch/solbourne/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.6 2007/05/28 21:02:49 thib Exp $ */ +/* $OpenBSD: param.h,v 1.7 2008/05/03 20:18:24 martin Exp $ */ /* OpenBSD: param.h,v 1.29 2004/08/06 22:31:31 mickey Exp */ /* @@ -104,10 +104,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/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c index e1a9b85c0cf..d24d05b83b9 100644 --- a/sys/arch/solbourne/solbourne/machdep.c +++ b/sys/arch/solbourne/solbourne/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.6 2008/04/09 16:58:10 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.7 2008/05/03 20:18:24 martin Exp $ */ /* OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp */ /* @@ -168,7 +168,7 @@ cpu_startup() */ printf(version); /*identifycpu();*/ - printf("real mem = %d\n", ctob(physmem)); + printf("real mem = %d\n", ptoa(physmem)); /* * Find out how much space we need, allocate it, diff --git a/sys/arch/solbourne/solbourne/trap.c b/sys/arch/solbourne/solbourne/trap.c index 345ff5525d5..b2e88c58f69 100644 --- a/sys/arch/solbourne/solbourne/trap.c +++ b/sys/arch/solbourne/solbourne/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.9 2007/03/15 10:22:29 art Exp $ */ +/* $OpenBSD: trap.c,v 1.10 2008/05/03 20:18:24 martin Exp $ */ /* OpenBSD: trap.c,v 1.42 2004/12/06 20:12:25 miod Exp */ /* @@ -225,7 +225,7 @@ userret(struct proc *p) while ((sig = CURSIG(p)) != 0) postsig(sig); - curpriority = p->p_priority = p->p_usrpri; + p->p_cpu->ci_schedstate.spc_curpriority = p->p_priority = p->p_usrpri; } /* |