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_cdrom.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_cdrom.c')
| -rw-r--r-- | sys/compat/linux/linux_cdrom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_cdrom.c b/sys/compat/linux/linux_cdrom.c index 7c74d8d91b0..b1ca8e16af0 100644 --- a/sys/compat/linux/linux_cdrom.c +++ b/sys/compat/linux/linux_cdrom.c @@ -1,5 +1,5 @@ -/* $OpenBSD: linux_cdrom.c,v 1.10 2014/01/21 01:49:13 tedu Exp $ */ +/* $OpenBSD: linux_cdrom.c,v 1.11 2014/03/26 05:23:42 guenther Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> * All rights reserved. @@ -135,7 +135,7 @@ linux_ioctl_cdrom(p, v, retval) if (error) goto out; - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); memset(&tmpb.tes, 0, sizeof tmpb.tes); tmpb.tes.starting_track = tmpl.te.cdte_track; @@ -164,7 +164,7 @@ linux_ioctl_cdrom(p, v, retval) if (error) goto out; - sg = stackgap_init(p->p_emul); + sg = stackgap_init(p); memset(&tmpb.sc, 0, sizeof tmpb.sc); tmpb.sc.data_format = CD_CURRENT_POSITION; |