Wed Feb 19 21:45:01 2014 UTC ()
Explicitly include x86/fpu.h instead of relying in x86/frame.h including it.


(dsl)
diff -r1.35 -r1.36 src/sys/compat/linux32/arch/amd64/linux32_machdep.c
cvs diff -r1.35 -r1.36 src/sys/compat/linux32/arch/amd64/linux32_machdep.c (expand / switch to unified diff)

--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c 2014/02/15 10:11:15 1.35
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c 2014/02/19 21:45:01 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux32_machdep.c,v 1.35 2014/02/15 10:11:15 dsl Exp $ */ 1/* $NetBSD: linux32_machdep.c,v 1.36 2014/02/19 21:45:01 dsl Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. 4 * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -21,36 +21,38 @@ @@ -21,36 +21,38 @@
21 * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS''  21 * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS''
22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
23 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 23 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS  24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.35 2014/02/15 10:11:15 dsl Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.36 2014/02/19 21:45:01 dsl Exp $");
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/proc.h> 37#include <sys/proc.h>
38#include <sys/exec.h> 38#include <sys/exec.h>
39 39
40#include <machine/vmparam.h> 40#include <machine/vmparam.h>
41#include <machine/cpufunc.h> 41#include <machine/cpufunc.h>
42#include <machine/netbsd32_machdep.h> 42#include <machine/netbsd32_machdep.h>
43 43
 44#include <x86/fpu.h>
 45
44#include <compat/netbsd32/netbsd32.h> 46#include <compat/netbsd32/netbsd32.h>
45#include <compat/netbsd32/netbsd32_syscallargs.h> 47#include <compat/netbsd32/netbsd32_syscallargs.h>
46 48
47#include <compat/linux/common/linux_types.h> 49#include <compat/linux/common/linux_types.h>
48#include <compat/linux/common/linux_emuldata.h> 50#include <compat/linux/common/linux_emuldata.h>
49#include <compat/linux/common/linux_signal.h> 51#include <compat/linux/common/linux_signal.h>
50#include <compat/linux/common/linux_errno.h> 52#include <compat/linux/common/linux_errno.h>
51#include <compat/linux/common/linux_exec.h> 53#include <compat/linux/common/linux_exec.h>
52#include <compat/linux/common/linux_ipc.h> 54#include <compat/linux/common/linux_ipc.h>
53#include <compat/linux/common/linux_sem.h> 55#include <compat/linux/common/linux_sem.h>
54#include <compat/linux/linux_syscallargs.h> 56#include <compat/linux/linux_syscallargs.h>
55 57
56#include <compat/linux32/common/linux32_types.h> 58#include <compat/linux32/common/linux32_types.h>