[src/matt-nb6-plus]: src/sys/compat/linux/arch/arm Sync with HEAD

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d60a4b68758
branches:  matt-nb6-plus
changeset: 774515:2d60a4b68758
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Nov 29 16:31:01 2012 +0000

description:
Sync with HEAD

diffstat:

 sys/compat/linux/arch/arm/linux_machdep.c |  18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diffs (61 lines):

diff -r 240cc52f028d -r 2d60a4b68758 sys/compat/linux/arch/arm/linux_machdep.c
--- a/sys/compat/linux/arch/arm/linux_machdep.c Wed Nov 28 22:59:09 2012 +0000
+++ b/sys/compat/linux/arch/arm/linux_machdep.c Thu Nov 29 16:31:01 2012 +0000
@@ -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 @@
 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 @@
 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 @@
                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;