diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-01-15 12:00:10 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-01-15 12:00:10 +0000 |
| commit | 872795cd0deb82b58940de59079f1b09dbd5c400 (patch) | |
| tree | 567b4250d7a029a35081e4f75992254eeb14767c /sys/arch | |
| parent | 026d208a5325af2407f23c6b72f4af55b0546226 (diff) | |
Make this work with new alpha code.
From d@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/alpha/alpha/netbsd_machdep.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/alpha/alpha/netbsd_machdep.c b/sys/arch/alpha/alpha/netbsd_machdep.c index af735a477e3..c61551f45f9 100644 --- a/sys/arch/alpha/alpha/netbsd_machdep.c +++ b/sys/arch/alpha/alpha/netbsd_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_machdep.c,v 1.3 1999/09/26 11:07:32 kstailey Exp $ */ +/* $OpenBSD: netbsd_machdep.c,v 1.4 2001/01/15 12:00:09 art Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -37,6 +37,7 @@ #include <sys/mount.h> #include <sys/syscallargs.h> #include <sys/user.h> +#include <machine/cpu.h> #include <vm/vm.h> @@ -112,7 +113,6 @@ netbsd_sendsig(catcher, sig, mask, code, type, val) struct sigacts *psp = p->p_sigacts; int oonstack, fsize, rndfsize; extern char netbsd_sigcode[], netbsd_esigcode[]; - extern struct proc *fpcurproc; struct netbsd_sigcontext nbsc; frame = p->p_md.md_tf; @@ -134,13 +134,13 @@ netbsd_sendsig(catcher, sig, mask, code, type, val) } else scp = (struct sigcontext *)(alpha_pal_rdusp() - rndfsize); if ((u_long)scp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) - (void)grow(p, (u_long)scp); + (void)uvm_grow(p, (u_long)scp); #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("netbsd_sendsig(%d): sig %d ssp %p usp %p scp %p\n", p->p_pid, sig, &oonstack, alpha_pal_rdusp(), scp); #endif - if (useracc((caddr_t)scp, fsize, B_WRITE) == 0) { + if (uvm_useracc((caddr_t)scp, fsize, B_WRITE) == 0) { #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("netbsd_sendsig(%d): useracc failed on sig %d\n", @@ -228,7 +228,6 @@ netbsd_sys___sigreturn14(p, v, retval) syscallarg(struct netbsd_sigcontext *) sigcntxp; } */ *uap = v; struct sigcontext ksc; - extern struct proc *fpcurproc; struct netbsd_sigcontext *nbscp, nbsc; nbscp = SCARG(uap, sigcntxp); @@ -243,7 +242,7 @@ netbsd_sys___sigreturn14(p, v, retval) * Test and fetch the context structure. * We grab it all at once for speed. */ - if (useracc((caddr_t)nbscp, sizeof (*nbscp), B_WRITE) == 0 || + if (uvm_useracc((caddr_t)nbscp, sizeof (*nbscp), B_WRITE) == 0 || copyin((caddr_t)nbscp, (caddr_t)&nbsc, sizeof (nbsc))) return (EFAULT); |