diff options
| author |   guenther <guenther@openbsd.org> | 2014-03-26 05:23:41 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2014-03-26 05:23:41 +0000 |
| commit | 8f76f5add34ff13fa8a804c10695e708224e99b4 (patch) | |
| tree | 89d3b1dd1cb5e145e1de975c5db86c74df5912e4 /sys/compat/linux/linux_file64.c | |
| parent | Drop Apollo Domain keyboard support, now that hp300 has bitten the dust. (diff) | |
| download | wireguard-openbsd-8f76f5add34ff13fa8a804c10695e708224e99b4.tar.xz wireguard-openbsd-8f76f5add34ff13fa8a804c10695e708224e99b4.zip | |
Move p_emul and p_sigcode from proc to process.
Tweak the handling of ktrace EMUL when changing ktracing: only
generate one per process (not one per thread) and pass the correct
proc pointer down to the VFS layer. Permit generating of NAMI and
CSW records inside ktrace(2) itself.
ok deraadt@ millert@
Diffstat (limited to 'sys/compat/linux/linux_file64.c')
| -rw-r--r-- | sys/compat/linux/linux_file64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/linux/linux_file64.c b/sys/compat/linux/linux_file64.c index 5d7b8961c0c..7a2f91fc89b 100644 --- a/sys/compat/linux/linux_file64.c +++ b/sys/compat/linux/linux_file64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_file64.c,v 1.8 2013/05/10 10:31:16 pirofti Exp $ */ +/* $OpenBSD: linux_file64.c,v 1.9 2014/03/26 05:23:42 guenther Exp $ */ /* $NetBSD: linux_file64.c,v 1.2 2000/12/12 22:24:56 jdolecek Exp $ */ /*- @@ -123,7 +123,7 @@ linux_sys_fstat64(p, v, retval) caddr_t sg; int error; - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); st = stackgap_alloc(&sg, sizeof (struct stat)); @@ -159,7 +159,7 @@ linux_do_stat64(p, v, retval, dolstat) int error; struct linux_sys_stat64_args *uap = v; - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); st = stackgap_alloc(&sg, sizeof (struct stat)); LINUX_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path)); @@ -221,7 +221,7 @@ linux_sys_truncate64(p, v, retval) syscallarg(off_t) length; } */ *uap = v; struct sys_truncate_args ta; - caddr_t sg = stackgap_init(p->p_emul); + caddr_t sg = stackgap_init(p); LINUX_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path)); @@ -321,7 +321,7 @@ linux_sys_fcntl64(p, v, retval) switch (cmd) { case LINUX_F_GETLK64: - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); if ((error = copyin(arg, &lfl, sizeof lfl))) return error; linux_to_bsd_flock64(&lfl, &bfl); @@ -344,7 +344,7 @@ linux_sys_fcntl64(p, v, retval) if ((error = copyin(arg, &lfl, sizeof lfl))) return error; linux_to_bsd_flock64(&lfl, &bfl); - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); bfp = (struct flock *) stackgap_alloc(&sg, sizeof *bfp); if ((error = copyout(&bfl, bfp, sizeof bfl))) return error; |