Module Name: src
Committed By: dsl
Date: Sun Jul 8 20:14:12 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64: fpu.c machdep.c netbsd32_machdep.c
process_machdep.c
src/sys/arch/amd64/include: proc.h
src/sys/arch/sh3/include: proc.h userret.h
src/sys/arch/sh3/sh3: exception.c process_machdep.c sh3_machdep.c
src/sys/compat/linux/arch/amd64: linux_machdep.c
src/sys/compat/linux32/arch/amd64: linux32_machdep.c
Log Message:
The MDP_USEDFPU (amd64 and sh3) and MDP_SSTEP (sh3) are lwp flags not
process ones, rename to MDL_xxx.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amd64/amd64/fpu.c
cvs rdiff -u -r1.187 -r1.188 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/amd64/process_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/include/proc.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sh3/include/proc.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sh3/include/userret.h
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/sh3/sh3/exception.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sh3/sh3/process_machdep.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs rdiff -u -r1.29 -r1.30 \
src/sys/compat/linux32/arch/amd64/linux32_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/arch/amd64/amd64/fpu.c
diff -u src/sys/arch/amd64/amd64/fpu.c:1.38 src/sys/arch/amd64/amd64/fpu.c:1.39
--- src/sys/arch/amd64/amd64/fpu.c:1.38 Thu Aug 11 18:36:14 2011
+++ src/sys/arch/amd64/amd64/fpu.c Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.38 2011/08/11 18:36:14 cherry Exp $ */
+/* $NetBSD: fpu.c,v 1.39 2012/07/08 20:14:11 dsl Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.38 2011/08/11 18:36:14 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.39 2012/07/08 20:14:11 dsl Exp $");
#include "opt_multiprocessor.h"
@@ -137,17 +137,17 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.38
/*
* We do lazy initialization and switching using the TS bit in cr0 and the
- * MDP_USEDFPU bit in mdproc.
+ * MDL_USEDFPU bit in mdlwp.
*
* DNA exceptions are handled like this:
*
* 1) If there is no FPU, return and go to the emulator.
* 2) If someone else has used the FPU, save its state into that lwp's PCB.
- * 3a) If MDP_USEDFPU is not set, set it and initialize the FPU.
+ * 3a) If MDL_USEDFPU is not set, set it and initialize the FPU.
* 3b) Otherwise, reload the lwp's previous FPU state.
*
* When a lwp is created or exec()s, its saved cr0 image has the TS bit
- * set and the MDP_USEDFPU bit clear. The MDP_USEDFPU bit is set when the
+ * set and the MDL_USEDFPU bit clear. The MDL_USEDFPU bit is set when the
* lwp first gets a DNA and the FPU is initialized. The TS bit is turned
* off when the FPU is used, and turned on again later when the lwp's FPU
* state is saved.
@@ -305,13 +305,13 @@ fpudna(struct cpu_info *ci)
clts();
ci->ci_fpcurlwp = l;
pcb->pcb_fpcpu = ci;
- if ((l->l_md.md_flags & MDP_USEDFPU) == 0) {
+ if ((l->l_md.md_flags & MDL_USEDFPU) == 0) {
fninit();
cw = pcb->pcb_savefpu.fp_fxsave.fx_fcw;
fldcw(&cw);
mxcsr = pcb->pcb_savefpu.fp_fxsave.fx_mxcsr;
x86_ldmxcsr(&mxcsr);
- l->l_md.md_flags |= MDP_USEDFPU;
+ l->l_md.md_flags |= MDL_USEDFPU;
} else {
/*
* AMD FPU's do not restore FIP, FDP, and FOP on fxrstor,
@@ -426,6 +426,6 @@ fpusave_lwp(struct lwp *l, bool save)
if (!save) {
/* Ensure we restart with a clean slate. */
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
}
}
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.187 src/sys/arch/amd64/amd64/machdep.c:1.188
--- src/sys/arch/amd64/amd64/machdep.c:1.187 Wed Jun 27 00:37:07 2012
+++ src/sys/arch/amd64/amd64/machdep.c Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.187 2012/06/27 00:37:07 jym Exp $ */
+/* $NetBSD: machdep.c,v 1.188 2012/07/08 20:14:11 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 2012/06/27 00:37:07 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.188 2012/07/08 20:14:11 dsl Exp $");
/* #define XENDEBUG_LOW */
@@ -627,7 +627,7 @@ buildcontext(struct lwp *l, void *catche
tf->tf_ss = GSEL(GUDATA_SEL, SEL_UPL);
/* Ensure FP state is reset, if FP is used. */
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
}
void
@@ -674,7 +674,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
/*
* Don't bother copying out FP state if there is none.
*/
- if (l->l_md.md_flags & MDP_USEDFPU)
+ if (l->l_md.md_flags & MDL_USEDFPU)
tocopy = sizeof (struct sigframe_siginfo);
else
tocopy = sizeof (struct sigframe_siginfo) -
@@ -1406,7 +1406,7 @@ setregs(struct lwp *l, struct exec_packa
pmap_ldt_cleanup(l);
#endif
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
pcb->pcb_flags = 0;
pcb->pcb_savefpu.fp_fxsave.fx_fcw = __NetBSD_NPXCW__;
pcb->pcb_savefpu.fp_fxsave.fx_mxcsr = __INITIAL_MXCSR__;
@@ -1999,7 +1999,7 @@ cpu_getmcontext(struct lwp *l, mcontext_
mcp->_mc_tlsbase = (uintptr_t)l->l_private;;
*flags |= _UC_TLSBASE;
- if ((l->l_md.md_flags & MDP_USEDFPU) != 0) {
+ if ((l->l_md.md_flags & MDL_USEDFPU) != 0) {
struct pcb *pcb = lwp_getpcb(l);
if (pcb->pcb_fpcpu) {
@@ -2063,7 +2063,7 @@ cpu_setmcontext(struct lwp *l, const mco
if ((flags & _UC_FPU) != 0) {
memcpy(&pcb->pcb_savefpu.fp_fxsave, mcp->__fpregs,
sizeof (mcp->__fpregs));
- l->l_md.md_flags |= MDP_USEDFPU;
+ l->l_md.md_flags |= MDL_USEDFPU;
}
if ((flags & _UC_TLSBASE) != 0)
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.77 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.78
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.77 Tue Jun 12 22:16:05 2012
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.77 2012/06/12 22:16:05 bouyer Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.78 2012/07/08 20:14:11 dsl Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.77 2012/06/12 22:16:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.78 2012/07/08 20:14:11 dsl Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -142,7 +142,7 @@ netbsd32_setregs(struct lwp *l, struct e
netbsd32_adjust_limits(p);
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
pcb->pcb_flags = PCB_COMPAT32;
pcb->pcb_savefpu.fp_fxsave.fx_fcw = __NetBSD_NPXCW__;
pcb->pcb_savefpu.fp_fxsave.fx_mxcsr = __INITIAL_MXCSR__;
@@ -267,7 +267,7 @@ netbsd32_sendsig_sigcontext(const ksigin
tf->tf_gs = GSEL(GUDATA32_SEL, SEL_UPL);
/* Ensure FP state is reset, if FP is used. */
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
tf->tf_rip = (uint64_t)catcher;
tf->tf_cs = GSEL(GUCODE32_SEL, SEL_UPL);
@@ -370,7 +370,7 @@ netbsd32_sendsig_siginfo(const ksiginfo_
tf->tf_ss = GSEL(GUDATA32_SEL, SEL_UPL);
/* Ensure FP state is reset, if FP is used. */
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
/* Remember that we're now on the signal stack. */
if (onstack)
@@ -890,7 +890,7 @@ cpu_setmcontext32(struct lwp *l, const m
memcpy(&pcb->pcb_savefpu.fp_fxsave, &mcp->__fpregs,
sizeof (pcb->pcb_savefpu.fp_fxsave));
/* If not set already. */
- l->l_md.md_flags |= MDP_USEDFPU;
+ l->l_md.md_flags |= MDL_USEDFPU;
}
mutex_enter(p->p_lock);
@@ -941,7 +941,7 @@ cpu_getmcontext32(struct lwp *l, mcontex
*flags |= _UC_TLSBASE;
/* Save floating point register context, if any. */
- if ((l->l_md.md_flags & MDP_USEDFPU) != 0) {
+ if ((l->l_md.md_flags & MDL_USEDFPU) != 0) {
struct pcb *pcb = lwp_getpcb(l);
if (pcb->pcb_fpcpu) {
Index: src/sys/arch/amd64/amd64/process_machdep.c
diff -u src/sys/arch/amd64/amd64/process_machdep.c:1.20 src/sys/arch/amd64/amd64/process_machdep.c:1.21
--- src/sys/arch/amd64/amd64/process_machdep.c:1.20 Mon May 21 14:15:17 2012
+++ src/sys/arch/amd64/amd64/process_machdep.c Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.20 2012/05/21 14:15:17 martin Exp $ */
+/* $NetBSD: process_machdep.c,v 1.21 2012/07/08 20:14:11 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.20 2012/05/21 14:15:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.21 2012/07/08 20:14:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ process_read_fpregs(struct lwp *l, struc
{
struct fxsave64 *frame = process_fpframe(l);
- if (l->l_md.md_flags & MDP_USEDFPU) {
+ if (l->l_md.md_flags & MDL_USEDFPU) {
fpusave_lwp(l, true);
} else {
uint16_t cw;
@@ -127,7 +127,7 @@ process_read_fpregs(struct lwp *l, struc
frame->fx_ftw = 0x00; /* abridged tag; all empty */
frame->fx_mxcsr = mxcsr;
frame->fx_mxcsr_mask = mxcsr_mask;
- l->l_md.md_flags |= MDP_USEDFPU;
+ l->l_md.md_flags |= MDL_USEDFPU;
}
memcpy(®s->fxstate, frame, sizeof(*regs));
@@ -162,10 +162,10 @@ process_write_fpregs(struct lwp *l, cons
{
struct fxsave64 *frame = process_fpframe(l);
- if (l->l_md.md_flags & MDP_USEDFPU) {
+ if (l->l_md.md_flags & MDL_USEDFPU) {
fpusave_lwp(l, false);
} else {
- l->l_md.md_flags |= MDP_USEDFPU;
+ l->l_md.md_flags |= MDL_USEDFPU;
}
memcpy(frame, ®s->fxstate, sizeof(*regs));
Index: src/sys/arch/amd64/include/proc.h
diff -u src/sys/arch/amd64/include/proc.h:1.13 src/sys/arch/amd64/include/proc.h:1.14
--- src/sys/arch/amd64/include/proc.h:1.13 Fri Jan 14 02:06:22 2011
+++ src/sys/arch/amd64/include/proc.h Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.13 2011/01/14 02:06:22 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.14 2012/07/08 20:14:11 dsl Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -53,6 +53,8 @@ struct mdlwp {
volatile int md_astpending;
};
+#define MDL_USEDFPU 0x0001 /* has used the FPU */
+
struct mdproc {
int md_flags;
/* Syscall handling function */
@@ -60,7 +62,6 @@ struct mdproc {
};
/* md_flags */
-#define MDP_USEDFPU 0x0001 /* has used the FPU */
#define MDP_COMPAT 0x0002 /* x86 compatibility process */
#define MDP_SYSCALL 0x0004 /* entered kernel via syscall ins */
#define MDP_USEDMTRR 0x0008 /* has set volatile MTRRs */
Index: src/sys/arch/sh3/include/proc.h
diff -u src/sys/arch/sh3/include/proc.h:1.16 src/sys/arch/sh3/include/proc.h:1.17
--- src/sys/arch/sh3/include/proc.h:1.16 Wed Jan 26 23:26:37 2011
+++ src/sys/arch/sh3/include/proc.h Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.16 2011/01/26 23:26:37 uwe Exp $ */
+/* $NetBSD: proc.h,v 1.17 2012/07/08 20:14:11 dsl Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -57,8 +57,8 @@ struct mdlwp {
};
/* md_flags */
-#define MDP_USEDFPU 0x0001 /* has used the FPU */
-#define MDP_SSTEP 0x0002 /* single-stepped with PT_STEP */
+#define MDL_USEDFPU 0x0001 /* has used the FPU */
+#define MDL_SSTEP 0x0002 /* single-stepped with PT_STEP */
struct lwp;
Index: src/sys/arch/sh3/include/userret.h
diff -u src/sys/arch/sh3/include/userret.h:1.12 src/sys/arch/sh3/include/userret.h:1.13
--- src/sys/arch/sh3/include/userret.h:1.12 Tue Feb 8 20:20:23 2011
+++ src/sys/arch/sh3/include/userret.h Sun Jul 8 20:14:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.12 2011/02/08 20:20:23 rmind Exp $ */
+/* $NetBSD: userret.h,v 1.13 2012/07/08 20:14:11 dsl Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -56,7 +56,7 @@ userret(struct lwp *l)
#ifdef PTRACE
/* Check if lwp is being PT_STEP'ed */
- if (l->l_md.md_flags & MDP_SSTEP) {
+ if (l->l_md.md_flags & MDL_SSTEP) {
struct trapframe *tf = l->l_md.md_regs;
/*
Index: src/sys/arch/sh3/sh3/exception.c
diff -u src/sys/arch/sh3/sh3/exception.c:1.62 src/sys/arch/sh3/sh3/exception.c:1.63
--- src/sys/arch/sh3/sh3/exception.c:1.62 Sun Feb 19 21:06:26 2012
+++ src/sys/arch/sh3/sh3/exception.c Sun Jul 8 20:14:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exception.c,v 1.62 2012/02/19 21:06:26 rmind Exp $ */
+/* $NetBSD: exception.c,v 1.63 2012/07/08 20:14:12 dsl Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.62 2012/02/19 21:06:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.63 2012/07/08 20:14:12 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -185,7 +185,7 @@ general_exception(struct lwp *l, struct
break;
case EXPEVT_BREAK | EXP_USER:
- l->l_md.md_flags &= ~MDP_SSTEP;
+ l->l_md.md_flags &= ~MDL_SSTEP;
KSI_INIT_TRAP(&ksi);
ksi.ksi_signo = SIGTRAP;
ksi.ksi_code = TRAP_TRACE;
Index: src/sys/arch/sh3/sh3/process_machdep.c
diff -u src/sys/arch/sh3/sh3/process_machdep.c:1.19 src/sys/arch/sh3/sh3/process_machdep.c:1.20
--- src/sys/arch/sh3/sh3/process_machdep.c:1.19 Fri Jan 28 21:06:08 2011
+++ src/sys/arch/sh3/sh3/process_machdep.c Sun Jul 8 20:14:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.19 2011/01/28 21:06:08 uwe Exp $ */
+/* $NetBSD: process_machdep.c,v 1.20 2012/07/08 20:14:12 dsl Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.19 2011/01/28 21:06:08 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.20 2012/07/08 20:14:12 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -343,9 +343,9 @@ process_sstep(struct lwp *l, int sstep)
{
if (sstep)
- l->l_md.md_flags |= MDP_SSTEP;
+ l->l_md.md_flags |= MDL_SSTEP;
else
- l->l_md.md_flags &= ~MDP_SSTEP;
+ l->l_md.md_flags &= ~MDL_SSTEP;
return 0;
}
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.99 src/sys/arch/sh3/sh3/sh3_machdep.c:1.100
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.99 Mon May 21 14:15:18 2012
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Sun Jul 8 20:14:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.99 2012/05/21 14:15:18 martin Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.100 2012/07/08 20:14:12 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.99 2012/05/21 14:15:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.100 2012/07/08 20:14:12 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -516,7 +516,7 @@ setregs(struct lwp *l, struct exec_packa
{
struct trapframe *tf;
- l->l_md.md_flags &= ~(MDP_USEDFPU | MDP_SSTEP);
+ l->l_md.md_flags &= ~(MDL_USEDFPU | MDL_SSTEP);
tf = l->l_md.md_regs;
Index: src/sys/compat/linux/arch/amd64/linux_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.39 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.40
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.39 Fri Nov 18 04:07:43 2011
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Sun Jul 8 20:14:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.39 2011/11/18 04:07:43 christos Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.40 2012/07/08 20:14:12 dsl Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.39 2011/11/18 04:07:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.40 2012/07/08 20:14:12 dsl Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -88,7 +88,7 @@ linux_setregs(struct lwp *l, struct exec
if (pcb->pcb_fpcpu != NULL)
fpusave_lwp(l, 0);
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
pcb->pcb_flags = 0;
pcb->pcb_savefpu.fp_fxsave.fx_fcw = __NetBSD_NPXCW__;
pcb->pcb_savefpu.fp_fxsave.fx_mxcsr = __INITIAL_MXCSR__;
@@ -156,7 +156,7 @@ linux_sendsig(const ksiginfo_t *ksi, con
/*
* Save FPU state, if any
*/
- if (l->l_md.md_flags & MDP_USEDFPU) {
+ if (l->l_md.md_flags & MDL_USEDFPU) {
sp = (char *)
(((long)sp - sizeof(struct linux__fpstate)) & ~0xfUL);
fpsp = (struct linux__fpstate *)sp;
Index: src/sys/compat/linux32/arch/amd64/linux32_machdep.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.29 src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.30
--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c:1.29 Fri Mar 4 22:25:31 2011
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c Sun Jul 8 20:14:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_machdep.c,v 1.29 2011/03/04 22:25:31 joerg Exp $ */
+/* $NetBSD: linux32_machdep.c,v 1.30 2012/07/08 20:14:12 dsl Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.29 2011/03/04 22:25:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.30 2012/07/08 20:14:12 dsl Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -286,7 +286,7 @@ linux32_setregs(struct lwp *l, struct ex
netbsd32_adjust_limits(p);
- l->l_md.md_flags &= ~MDP_USEDFPU;
+ l->l_md.md_flags &= ~MDL_USEDFPU;
pcb->pcb_flags = PCB_COMPAT32;
pcb->pcb_savefpu.fp_fxsave.fx_fcw = __Linux_NPXCW__;
pcb->pcb_savefpu.fp_fxsave.fx_mxcsr = __INITIAL_MXCSR__;
