diff options
author | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-27 04:39:07 +0000 |
---|---|---|
committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-27 04:39:07 +0000 |
commit | 02b4ba4991d93e5ec648d64119908c1726030c00 (patch) | |
tree | e0fa338a5f7b695116fba23660b44f1f43a0b664 /sys/arch | |
parent | 065049d634608a1c190784b54d1d43c090330ddb (diff) |
kill old vm
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/m68k/m68k/copy.s | 4 | ||||
-rw-r--r-- | sys/arch/m68k/m68k/sig_machdep.c | 19 | ||||
-rw-r--r-- | sys/arch/m68k/m68k/sunos_machdep.c | 17 |
3 files changed, 3 insertions, 37 deletions
diff --git a/sys/arch/m68k/m68k/copy.s b/sys/arch/m68k/m68k/copy.s index b27a0a5a3dd..6f1aef094dc 100644 --- a/sys/arch/m68k/m68k/copy.s +++ b/sys/arch/m68k/m68k/copy.s @@ -1,4 +1,4 @@ -/* $OpenBSD: copy.s,v 1.10 2001/03/28 22:38:13 art Exp $ */ +/* $OpenBSD: copy.s,v 1.11 2001/06/27 04:39:05 art Exp $ */ /* $NetBSD: copy.s,v 1.30 1998/03/04 06:39:14 thorpej Exp $ */ /*- @@ -315,7 +315,6 @@ Lcosfault: moveq #EFAULT,d0 bra Lcosdone -#if defined(UVM) /* * kcopy(const void *src, void *dst, size_t len); * @@ -346,7 +345,6 @@ Lkcfault: addl #16,sp | pop args and return address moveq #EFAULT,d0 | indicate a fault bra Lkcdone -#endif /* UVM */ /* * fuword(caddr_t uaddr); diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c index cb8de4e2861..5388127843f 100644 --- a/sys/arch/m68k/m68k/sig_machdep.c +++ b/sys/arch/m68k/m68k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.5 2000/05/27 21:48:37 art Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.6 2001/06/27 04:39:06 art Exp $ */ /* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */ /* @@ -85,9 +85,7 @@ #include <sys/buf.h> #include <vm/vm.h> -#if defined(UVM) #include <uvm/uvm_extern.h> -#endif #include <sys/syscallargs.h> @@ -169,23 +167,14 @@ sendsig(catcher, sig, mask, code, type, val) psp->ps_sigstk.ss_flags |= SS_ONSTACK; } else fp = (struct sigframe *)(frame->f_regs[SP] - fsize); -#if defined(UVM) if ((unsigned)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) (void)uvm_grow(p, (unsigned)fp); -#else - if ((unsigned)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) - (void)grow(p, (unsigned)fp); -#endif #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sendsig(%d): sig %d ssp %p usp %p scp %p ft %d\n", p->p_pid, sig, &oonstack, fp, &fp->sf_sc, ft); #endif -#if defined(UVM) if (uvm_useracc((caddr_t)fp, fsize, B_WRITE) == 0) { -#else - if (useracc((caddr_t)fp, fsize, B_WRITE) == 0) { -#endif #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sendsig(%d): useracc failed on sig %d\n", @@ -335,15 +324,9 @@ sys_sigreturn(p, v, retval) * Test and fetch the context structure. * We grab it all at once for speed. */ -#if defined(UVM) if (uvm_useracc((caddr_t)scp, sizeof (*scp), B_WRITE) == 0 || copyin((caddr_t)scp, (caddr_t)&tsigc, sizeof tsigc)) return (EINVAL); -#else - if (useracc((caddr_t)scp, sizeof (*scp), B_WRITE) == 0 || - copyin((caddr_t)scp, (caddr_t)&tsigc, sizeof tsigc)) - return (EINVAL); -#endif scp = &tsigc; if ((scp->sc_ps & (PSL_MBZ|PSL_IPL|PSL_S)) != 0) return (EINVAL); diff --git a/sys/arch/m68k/m68k/sunos_machdep.c b/sys/arch/m68k/m68k/sunos_machdep.c index f84d7e06e8e..e76aaf4e987 100644 --- a/sys/arch/m68k/m68k/sunos_machdep.c +++ b/sys/arch/m68k/m68k/sunos_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_machdep.c,v 1.12 2001/05/15 01:43:16 millert Exp $ */ +/* $OpenBSD: sunos_machdep.c,v 1.13 2001/06/27 04:39:06 art Exp $ */ /* $NetBSD: sunos_machdep.c,v 1.12 1996/10/13 03:19:22 christos Exp $ */ /* @@ -143,23 +143,14 @@ sunos_sendsig(catcher, sig, mask, code, type, val) psp->ps_sigstk.ss_flags |= SS_ONSTACK; } else fp = (struct sunos_sigframe *)frame->f_regs[SP] - 1; -#if defined(UVM) if ((vaddr_t)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) (void)uvm_grow(p, (unsigned)fp); -#else - if ((vaddr_t)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) - (void)grow(p, (unsigned)fp); -#endif #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sunos_sendsig(%d): sig %d ssp %p usp %p scp %p ft %d\n", p->p_pid, sig, &oonstack, fp, &fp->sf_sc, ft); #endif -#if defined(UVM) if (uvm_useracc((caddr_t)fp, fsize, B_WRITE) == 0) { -#else - if (useracc((caddr_t)fp, fsize, B_WRITE) == 0) { -#endif #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sunos_sendsig(%d): useracc failed on sig %d\n", @@ -253,15 +244,9 @@ sunos_sys_sigreturn(p, v, retval) * Test and fetch the context structure. * We grab it all at once for speed. */ -#if defined(UVM) if (uvm_useracc((caddr_t)scp, sizeof(*scp), B_WRITE) == 0 || copyin((caddr_t)scp, (caddr_t)&tsigc, sizeof(tsigc))) return (EINVAL); -#else - if (useracc((caddr_t)scp, sizeof(*scp), B_WRITE) == 0 || - copyin((caddr_t)scp, (caddr_t)&tsigc, sizeof(tsigc))) - return (EINVAL); -#endif scp = &tsigc; if ((scp->sc_ps & (PSL_MBZ|PSL_IPL|PSL_S)) != 0) return (EINVAL); |