From 4c02bded00f544ce6adf4fff0ef83a69cfba0156 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Thu, 27 Jul 2000 01:22:24 +0000 Subject: [PATCH] Remove the only use of SCARG and perform dead code elimination. --- sys/alpha/linux/linux_sysvec.c | 5 ++--- sys/compat/linux/linux_util.h | 4 ---- sys/i386/linux/linux_sysvec.c | 5 ++--- sys/i386/linux/linux_util.h | 4 ---- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c index 052885b8a71..c739f6937e9 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -323,7 +323,7 @@ linux_sigreturn(p, args) struct proc *p; struct linux_sigreturn_args *args; { - struct linux_sigcontext *scp, context; + struct linux_sigcontext context; register struct trapframe *regs; int eflags; @@ -338,8 +338,7 @@ linux_sigreturn(p, args) * It is unsafe to keep track of it ourselves, in the event that a * program jumps out of a signal handler. */ - scp = SCARG(args,scp); - if (copyin((caddr_t)scp, &context, sizeof(*scp)) != 0) + if (copyin((caddr_t)args->scp, &context, sizeof(context)) != 0) return (EFAULT); /* diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h index a54ddfd4a7a..444c9a528d1 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -49,10 +49,6 @@ #include #include -#ifndef SCARG -#define SCARG(p, x) (p)->x -#endif - static __inline caddr_t stackgap_init(void); static __inline void *stackgap_alloc(caddr_t *, size_t); diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 052885b8a71..c739f6937e9 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -323,7 +323,7 @@ linux_sigreturn(p, args) struct proc *p; struct linux_sigreturn_args *args; { - struct linux_sigcontext *scp, context; + struct linux_sigcontext context; register struct trapframe *regs; int eflags; @@ -338,8 +338,7 @@ linux_sigreturn(p, args) * It is unsafe to keep track of it ourselves, in the event that a * program jumps out of a signal handler. */ - scp = SCARG(args,scp); - if (copyin((caddr_t)scp, &context, sizeof(*scp)) != 0) + if (copyin((caddr_t)args->scp, &context, sizeof(context)) != 0) return (EFAULT); /* diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h index a54ddfd4a7a..444c9a528d1 100644 --- a/sys/i386/linux/linux_util.h +++ b/sys/i386/linux/linux_util.h @@ -49,10 +49,6 @@ #include #include -#ifndef SCARG -#define SCARG(p, x) (p)->x -#endif - static __inline caddr_t stackgap_init(void); static __inline void *stackgap_alloc(caddr_t *, size_t);