 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $ */
+/*	$NetBSD: linux_machdep.c,v 1.45 2011/01/20 11:59:24 he Exp $ */
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Emmanuel Dreyfus.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.44 2011/01/18 01:13:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.45 2011/01/20 11:59:24 he 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/malloc.h>
 @@ -171,27 +171,27 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	linux_regs.lctr = tf->tf_ctr;
 	linux_regs.llink = tf->tf_lr;
 	linux_regs.lxer = tf->tf_xer;
 	linux_regs.lccr = tf->tf_cr;
 	linux_regs.lmq = 0;  			/* Unused, 601 only */
 	linux_regs.ltrap = tf->tf_exc;
 	linux_regs.ldar = tf->tf_dar;
 	linux_regs.ldsisr = tf->tf_dsisr;
 	linux_regs.lresult = 0;
 	memset(&frame, 0, sizeof(frame));
 	memcpy(&frame.lgp_regs, &linux_regs, sizeof(linux_regs));
-	save_fpu_lwp(curlwp, FPU_SAVE);
+	fpu_save_lwp(curlwp, FPU_SAVE);
 	memcpy(&frame.lfp_regs, curpcb->pcb_fpu.fpreg, sizeof(frame.lfp_regs));
 	/*
 	 * Copy Linux's signal trampoline on the user stack It should not
 	 * be used, but Linux binaries might expect it to be there.
 	 */
 	frame.ltramp[0] = 0x38997777; /* li r0, 0x7777 */
 	frame.ltramp[1] = 0x44000002; /* sc */
 	/*
 	 * Move it to the user stack
 	 * There is a little trick here, about the LINUX_ABIGAP: the
 	 * linux_sigreg structure has a 56 int gap to support rs6000/xcoff
 @@ -309,27 +309,27 @@ linux_sys_rt_sigreturn(struct lwp *l, co
 	for (i = 0; i < 32; i++)
 		tf->tf_fixreg[i] = lregs->lgpr[i];
 	tf->tf_lr = lregs->llink;
 	tf->tf_cr = lregs->lccr;
 	tf->tf_xer = lregs->lxer;
 	tf->tf_ctr = lregs->lctr;
 	tf->tf_srr0 = lregs->lnip;
 	tf->tf_srr1 = lregs->lmsr;
 	/*
 	 * Make sure the fpu state is discarded
 	 */
-	save_fpu_lwp(curlwp, FPU_DISCARD);
+	fpu_save_lwp(curlwp, FPU_DISCARD);
 	memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs,
 	       sizeof(curpcb->pcb_fpu.fpreg));
 	mutex_enter(p->p_lock);
 	/*
 	 * Restore signal stack.
+	 *
 	 * XXX cannot find the onstack information in Linux sig context.
 	 * Is signal stack really supported on Linux?
+	 *
 	 * It seems to be supported in libc6...
 @@ -399,27 +399,27 @@ linux_sys_sigreturn(struct lwp *l, const
 	for (i = 0; i < 32; i++)
 		tf->tf_fixreg[i] = lregs->lgpr[i];
 	tf->tf_lr = lregs->llink;
 	tf->tf_cr = lregs->lccr;
 	tf->tf_xer = lregs->lxer;
 	tf->tf_ctr = lregs->lctr;
 	tf->tf_srr0 = lregs->lnip;
 	tf->tf_srr1 = lregs->lmsr;
 	/*
 	 * Make sure the fpu state is discarded
 	 */
-	save_fpu_lwp(curlwp, FPU_DISCARD);
+	fpu_save_lwp(curlwp, FPU_DISCARD);
 	memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs,
 	       sizeof(curpcb->pcb_fpu.fpreg));
 	mutex_enter(p->p_lock);
 	/*
 	 * Restore signal stack.
+	 *
 	 * XXX cannot find the onstack information in Linux sig context.
 	 * Is signal stack really supported on Linux?
 	 */
 #if 0