diff options
| author | marcel <marcel@FreeBSD.org> | 2000-07-27 01:22:24 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2000-07-27 01:22:24 +0000 |
| commit | e68c0dd24922b80c65c9c4120720b13cd27661a4 (patch) | |
| tree | 7af730ed15f5502ee38f1ea0ce0b31150e5d773b /sys | |
| parent | 16e7b87995f3f978ee2cc5a190db90f166afbfc1 (diff) | |
| download | FreeBSD-src-e68c0dd24922b80c65c9c4120720b13cd27661a4.zip FreeBSD-src-e68c0dd24922b80c65c9c4120720b13cd27661a4.tar.gz | |
Remove the only use of SCARG and perform dead code elimination.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/alpha/linux/linux_sysvec.c | 5 | ||||
| -rw-r--r-- | sys/compat/linux/linux_util.h | 4 | ||||
| -rw-r--r-- | sys/i386/linux/linux_sysvec.c | 5 | ||||
| -rw-r--r-- | 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 052885b..c739f69 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 a54ddfd..444c9a5 100644 --- a/sys/compat/linux/linux_util.h +++ b/sys/compat/linux/linux_util.h @@ -49,10 +49,6 @@ #include <sys/sysent.h> #include <sys/cdefs.h> -#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 052885b..c739f69 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 a54ddfd..444c9a5 100644 --- a/sys/i386/linux/linux_util.h +++ b/sys/i386/linux/linux_util.h @@ -49,10 +49,6 @@ #include <sys/sysent.h> #include <sys/cdefs.h> -#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); |
