From a99c2fff57c9c56fe14e1ed604db475ac05d8a27 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 23 Jun 2003 18:12:13 +0000 Subject: [PATCH] proc->thread stage2: post-commit fixes/cleanup --- sys/dev/raid/asr/asr.c | 12 ++++++------ sys/emulation/svr4/svr4_fcntl.c | 4 ++-- sys/emulation/svr4/svr4_ioctl.c | 5 +++-- sys/emulation/svr4/svr4_signal.c | 5 +++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index 7ef23cecb5..f26e224011 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.3 2003/06/23 17:55:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.4 2003/06/23 18:11:59 dillon Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation @@ -455,17 +455,17 @@ STATIC int asr_ioctl __P(( IN u_long cmd, INOUT caddr_t data, int flag, - struct proc * proc)); + d_thread_t *td)); STATIC int asr_open __P(( IN dev_t dev, int32_t flags, int32_t ifmt, - IN d_thread_t * proc)); + IN d_thread_t *td)); STATIC int asr_close __P(( dev_t dev, int flags, int ifmt, - d_thread_t * proc)); + d_thread_t *td)); STATIC int asr_intr __P(( IN Asr_softc_t * sc)); STATIC void asr_timeout __P(( @@ -4396,13 +4396,13 @@ asr_ioctl( IN u_long cmd, INOUT caddr_t data, int flag, - struct proc * proc) + struct thread *td) { int i, j; OUT int error = 0; Asr_softc_t * sc = ASR_get_sc (dev); UNREFERENCED_PARAMETER(flag); - UNREFERENCED_PARAMETER(proc); + UNREFERENCED_PARAMETER(td); if (sc != (Asr_softc_t *)NULL) switch(cmd) { diff --git a/sys/emulation/svr4/svr4_fcntl.c b/sys/emulation/svr4/svr4_fcntl.c index 19aa86f0c5..522d3b1d81 100644 --- a/sys/emulation/svr4/svr4_fcntl.c +++ b/sys/emulation/svr4/svr4_fcntl.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_fcntl.c,v 1.7 1999/12/12 10:27:04 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.c,v 1.3 2003/06/23 17:55:49 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.c,v 1.4 2003/06/23 18:12:13 dillon Exp $ */ #include #include @@ -560,7 +560,7 @@ svr4_sys_fcntl(struct svr4_sys_fcntl_args *uap) long cmd; int flags; - DPRINTF(("Setting flags 0x%x\n", SCARG(uap, arg))); + DPRINTF(("Setting flags %p\n", SCARG(uap, arg))); cmd = SCARG(&fa, cmd); /* save it for a while */ SCARG(&fa, cmd) = F_GETFL; diff --git a/sys/emulation/svr4/svr4_ioctl.c b/sys/emulation/svr4/svr4_ioctl.c index e639e68834..2f323c0eaf 100644 --- a/sys/emulation/svr4/svr4_ioctl.c +++ b/sys/emulation/svr4/svr4_ioctl.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_ioctl.c,v 1.6 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ioctl.c,v 1.3 2003/06/23 17:55:49 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ioctl.c,v 1.4 2003/06/23 18:12:13 dillon Exp $ */ #include @@ -96,7 +96,8 @@ svr4_sys_ioctl(struct svr4_sys_ioctl_args *uap) svr4_decode_cmd(SCARG(uap, com), dir, &c, &num, &argsiz); - DPRINTF(("svr4_ioctl[%x](%d, _IO%s(%c, %d, %d), %p);\n", SCARG(uap, com), SCARG(uap, fd), + DPRINTF(("svr4_ioctl[%lx](%d, _IO%s(%c, %d, %d), %p);\n", + SCARG(uap, com), SCARG(uap, fd), dir, c, num, argsiz, SCARG(uap, data))); #endif retval = p->p_retval; diff --git a/sys/emulation/svr4/svr4_signal.c b/sys/emulation/svr4/svr4_signal.c index 04f31e5c5b..b47ee37946 100644 --- a/sys/emulation/svr4/svr4_signal.c +++ b/sys/emulation/svr4/svr4_signal.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_signal.c,v 1.9 2000/01/15 15:38:17 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.c,v 1.3 2003/06/23 17:55:49 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.c,v 1.4 2003/06/23 18:12:04 dillon Exp $ */ #include @@ -259,6 +259,7 @@ bsd_to_svr4_sigaltstack(bss, sss) int svr4_sys_sigaction(struct svr4_sys_sigaction_args *uap) { + struct proc *p = curproc; struct svr4_sigaction *nisa, *oisa, tmpisa; struct sigaction *nbsa, *obsa, tmpbsa; struct sigaction_args sa; @@ -294,7 +295,7 @@ svr4_sys_sigaction(struct svr4_sys_sigaction_args *uap) for (i = 0; i < 4; i++) DPRINTF(("\tssa_mask[%d] = %lx\n", i, nisa->ssa_mask.bits[i])); - DPRINTF(("\tssa_handler = %lx\n", nisa->ssa_handler)); + DPRINTF(("\tssa_handler = %p\n", nisa->ssa_handler)); } #endif -- 2.41.0