Module Name: src Committed By: matt Date: Thu Nov 29 16:31:01 UTC 2012
Modified Files: src/sys/compat/linux/arch/arm [matt-nb6-plus]: linux_machdep.c Log Message: Sync with HEAD To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.16.1 src/sys/compat/linux/arch/arm/linux_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/linux/arch/arm/linux_machdep.c diff -u src/sys/compat/linux/arch/arm/linux_machdep.c:1.29 src/sys/compat/linux/arch/arm/linux_machdep.c:1.29.16.1 --- src/sys/compat/linux/arch/arm/linux_machdep.c:1.29 Wed Jul 7 01:30:33 2010 +++ src/sys/compat/linux/arch/arm/linux_machdep.c Thu Nov 29 16:31:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.29 2010/07/07 01:30:33 chs Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.29.16.1 2012/11/29 16:31:01 matt Exp $ */ /*- * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.29 2010/07/07 01:30:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.29.16.1 2012/11/29 16:31:01 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,15 +76,14 @@ linux_setregs(struct lwp *l, struct exec void linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) { - struct lwp *l = curlwp; - struct proc *p = l->l_proc; - struct trapframe *tf; + struct lwp * const l = curlwp; + struct proc * const p = l->l_proc; + struct trapframe * const tf = lwp_trapframe(l); struct linux_sigframe *fp, frame; int onstack, error; const int sig = ksi->ksi_signo; sig_t catcher = SIGACTION(p, sig).sa_handler; - tf = process_frame(l); /* * The Linux version of this code is in @@ -195,13 +194,11 @@ int linux_sys_sigreturn(struct lwp *l, const struct linux_sys_sigreturn_args *v, register_t *retval) { + struct trapframe * const tf = lwp_trapframe(l); + struct proc * const p = l->l_proc; struct linux_sigframe *sfp, frame; - struct proc *p = l->l_proc; - struct trapframe *tf; sigset_t mask; - tf = process_frame(l); - /* * The trampoline code hands us the context. * It is unsafe to keep track of it ourselves, in the event that a @@ -219,7 +216,6 @@ linux_sys_sigreturn(struct lwp *l, const return EINVAL; /* Restore register context. */ - tf = process_frame(l); tf->tf_r0 = frame.sf_sc.sc_r0; tf->tf_r1 = frame.sf_sc.sc_r1; tf->tf_r2 = frame.sf_sc.sc_r2;