 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.51 2020/09/03 14:26:31 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
  * Based on sys/arch/i386/i386/linux_machdep.c:
  *	linux_machdep.c,v 1.42 1998/09/11 12:50:06 mycroft Exp
  *	written by Frank van der Linden
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51 2020/09/03 14:26:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -233,34 +233,31 @@ void setup_linux_sigframe(struct trapfra
 #endif /* DEBUG */
 	/*
 	 * Build the signal context to be used by sigreturn.
 	 */
 	memset(&sigframe.sf_sc, 0, sizeof(struct linux_sigcontext));
 	sigframe.sf_sc.sc_onstack = onstack;
 	native_to_linux_old_sigset(&sigframe.sf_sc.sc_mask, mask);
 	sigframe.sf_sc.sc_pc = tf->tf_regs[FRAME_PC];
 	sigframe.sf_sc.sc_ps = ALPHA_PSL_USERMODE;
 	frametoreg(tf, (struct reg *)sigframe.sf_sc.sc_regs);
 	sigframe.sf_sc.sc_regs[R_SP] = alpha_pal_rdusp();
-	if (l == fpcurlwp) {
+	if (fpu_valid_p(l)) {
 		struct pcb *pcb = lwp_getpcb(l);
-		alpha_pal_wrfen(1);
+		fpu_save(l);
 		savefpstate(&pcb->pcb_fp);
 		alpha_pal_wrfen(0);
 		sigframe.sf_sc.sc_fpcr = pcb->pcb_fp.fpr_cr;
 		fpcurlwp = NULL;
+	}
 	/* XXX ownedfp ? etc...? */
 	sigframe.sf_sc.sc_traparg_a0 = tf->tf_regs[FRAME_A0];
 	sigframe.sf_sc.sc_traparg_a1 = tf->tf_regs[FRAME_A1];
 	sigframe.sf_sc.sc_traparg_a2 = tf->tf_regs[FRAME_A2];
 	sendsig_reset(l, sig);
 	mutex_exit(p->p_lock);
 	error = copyout((void *)&sigframe, (void *)sfp, fsize);
 	mutex_enter(p->p_lock);
 	if (error != 0) {
 @@ -384,29 +381,26 @@ linux_restore_sigcontext(struct lwp *l,
 	/*
 	 * Check for security violations.
 	 * Linux doesn't allow any changes to the PSL.
 	 */
 	if (context.sc_ps != ALPHA_PSL_USERMODE)
 	    return(EINVAL);
 	l->l_md.md_tf->tf_regs[FRAME_PC] = context.sc_pc;
 	l->l_md.md_tf->tf_regs[FRAME_PS] = context.sc_ps;
 	regtoframe((struct reg *)context.sc_regs, l->l_md.md_tf);
 	alpha_pal_wrusp(context.sc_regs[R_SP]);
 	if (l == fpcurlwp)
 	    fpcurlwp = NULL;
 	/* Restore fp regs and fpr_cr */
 	pcb = lwp_getpcb(l);
 	memcpy(&pcb->pcb_fp, (struct fpreg *)context.sc_fpregs,
 	    sizeof(struct fpreg));
 	/* XXX sc_ownedfp ? */
 	/* XXX sc_fp_control ? */
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW)
 		printf("linux_rt_sigreturn(%d): returns\n", p->p_pid);
 #endif
 	return (EJUSTRETURN);
+}